diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 000000000000..772e9d5be9f1
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,57 @@
+
+#
+# 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.
+#
+
+github:
+ description: APM, Application Performance Monitoring System
+ homepage: https://skywalking.apache.org/
+ labels:
+ - skywalking
+ - observability
+ - apm
+ - distributed-tracing
+ - service-mesh
+ - dapper
+ - web-performance
+ - metrics
+ - logging
+ - prometheus
+ - open-telemetry
+ - zabbix
+ - ebpf
+ - telegraf
+ enabled_merge_buttons:
+ squash: true
+ merge: false
+ rebase: false
+ dependabot_updates: false
+ protected_branches:
+ master:
+ required_status_checks:
+ strict: true
+ contexts:
+ - Required
+ required_pull_request_reviews:
+ dismiss_stale_reviews: true
+ required_approving_review_count: 1
+ # Protect these branches for the website
+ website-docs/8.2.0: {}
+ website-docs/8.3.0: {}
+ website-docs/8.4.0: {}
+ website-docs/8.5.0: {}
+ website-docs/8.6.0: {}
+ website-docs/9.7.0: {}
diff --git a/.dlc.json b/.dlc.json
new file mode 100644
index 000000000000..4a0bb02cc4f2
--- /dev/null
+++ b/.dlc.json
@@ -0,0 +1,37 @@
+{
+ "ignorePatterns": [
+ {
+ "pattern": "^http://localhost"
+ },
+ {
+ "pattern": "^http://pgp.mit.edu:11371"
+ },
+ {
+ "pattern": "^https://github.com/apache/skywalking/blob/master/docs/en/changes/changes-x.y.z.md$"
+ },
+ {
+ "pattern": "^https://dist.apache.org/repos/dist/dev/skywalking/x.y.z$"
+ },
+ {
+ "pattern": "^https://twitter.com*"
+ },
+ {
+ "pattern": "^http://people.apache.org/committer-index.html"
+ },
+ {
+ "pattern": "^http://www.gnu.org/software/libc/documentation.html"
+ },
+ {
+ "pattern": "^https://x.com/AsfSkyWalking"
+ }
+ ],
+ "timeout": "10s",
+ "retryOn429": true,
+ "retryCount": 10,
+ "fallbackRetryDelay": "1000s",
+ "aliveStatusCodes": [
+ 200,
+ 401,
+ 403
+ ]
+}
diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
deleted file mode 100644
index 79a3bb232bdc..000000000000
--- a/.github/ISSUE_TEMPLATE
+++ /dev/null
@@ -1,16 +0,0 @@
-Please answer these questions before submitting your issue.
-
-### What version of sky-walking are you using?
-
-
-### What version of your OS?
-
-
-### What version of your JRE?
-
-
-### What company or project?
-
-
-### What did you do?
-If possible, provide a way for reproducing the error. e.g. demo application, component version.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 000000000000..8bc3d83d2c76
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,148 @@
+#
+# 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: SkyWalking Bug report
+title: "[Bug] "
+description: Problems and issues with code of Apache SkyWalking
+labels: [ "bug" ]
+body:
+ - type: markdown
+ attributes:
+ value: |
+
+
+ Thank you for finding the time to report the problem! We really appreciate the community efforts to improve SkyWalking.
+
+ Please make sure what you are reporting is indeed a bug with reproducible steps, if you want to ask questions
+ or share ideas, please [subscribe to our mailing list](mailto:dev-subscribe@skywalking.apache.org) and sent
+ emails to [our mailing list](mailto:dev@skywalking.apache.org), you can also head to our
+ [Discussion](https://github.com/apache/skywalking/discussions) tab.
+
+ - type: checkboxes
+ attributes:
+ label: Search before asking
+ description: >
+ Please make sure to search in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) first to see
+ whether the same issue was reported already.
+ options:
+ - label: >
+ I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar
+ issues.
+ required: true
+
+ - type: dropdown
+ attributes:
+ label: Apache SkyWalking Component
+ description: |
+ What Apache SkyWalking component are you using? Apache SkyWalking has many subprojects, please make sure
+ to choose the component that you found the bug. For non-Apache community projects, please refer to their
+ corresponding repos.
+ multiple: false
+ options:
+ - "OAP server (apache/skywalking)"
+ - "UI (apache/skywalking-booster-ui)"
+ - "Java Agent (apache/skywalking-java)"
+ - "Python Agent (apache/skywalking-python)"
+ - "NodeJS Server Side Agent (apache/skywalking-nodejs)"
+ - "NodeJS Client Side Agent (apache/skywalking-client-js)"
+ - "Nginx Lua Agent (apache/skywalking-nginx-lua)"
+ - "Kong Agent (apache/skywalking-kong)"
+ - "Go Agent (apache/skywalking-go)"
+ - "PHP (apache/skywalking-php)"
+ - "Rust (apache/skywalking-rust)"
+ - "Satellite (apache/skywalking-satellite)"
+ - "CLI (apache/skywalking-cli)"
+ - "Helm Chart (apache/skywalking-helm)"
+ - "SWCK (apache/skywalking-swck)"
+ - "License Tools (apache/skywalking-eyes)"
+ - "Infra E2E (apache/skywalking-infra-e2e)"
+ - "BanyanDB (apache/skywalking-banyandb)"
+ - "Agent Test Tool (apache/skywalking-agent-test-tool)"
+ - "Showcase (apache/skywalking-showcase)"
+ validations:
+ required: true
+
+ - type: textarea
+ attributes:
+ label: What happened
+ description: Describe what happened.
+ placeholder: >
+ Please provide the context in which the problem occurred and explain what happened
+ validations:
+ required: true
+
+ - type: textarea
+ attributes:
+ label: What you expected to happen
+ description: What do you think went wrong?
+ placeholder: >
+ Please explain why you think the behaviour is erroneous. It is extremely helpful if you copy and paste
+ the fragment of logs showing the exact error messages or wrong behaviour and screenshots for
+ UI problems. You can include files by dragging and dropping them here.
+
+ **NOTE**: please copy and paste texts instead of taking screenshots of them for easy future search.
+ validations:
+ required: true
+
+ - type: textarea
+ attributes:
+ label: How to reproduce
+ description: >
+ What should we do to reproduce the problem? If you are not able to provide a reproducible case,
+ please open a [Discussion](https://github.com/apache/skywalking/discussions) instead.
+ placeholder: >
+ Please make sure you provide a reproducible step-by-step case of how to reproduce the problem
+ as minimally and precisely as possible. Keep in mind we do not have access to your deployment.
+ Remember that non-reproducible issues will be closed! Opening a discussion is recommended as a
+ first step.
+ validations:
+ required: true
+
+ - type: textarea
+ attributes:
+ label: Anything else
+ description: Anything else we need to know?
+ placeholder: >
+ How often does this problem occur? (Once? Every time? Only when certain conditions are met?)
+ Any relevant logs to include? Put them here inside fenced
+ ``` ``` blocks or inside a collapsable details tag if it's too long:
+ x.log lots of stuff
+
+ - type: checkboxes
+ attributes:
+ label: Are you willing to submit a pull request to fix on your own?
+ description: >
+ This is absolutely not required, but we are happy to guide you in the contribution process
+ especially if you already have a good understanding of how to implement the fix.
+ SkyWalking is a totally community-driven project and we love to bring new contributors in.
+ Find us in #skywalking on Slack!
+ options:
+ - label: Yes I am willing to submit a pull request on my own!
+
+ - type: checkboxes
+ attributes:
+ label: Code of Conduct
+ description: The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it.
+ options:
+ - label: >
+ I agree to follow this project's
+ [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
+ required: true
+
+ - type: markdown
+ attributes:
+ value: "Thanks for completing our form!"
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000000..74a20d437a04
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+
+blank_issues_enabled: false
+contact_links:
+ - name: Ask a question or get support
+ url: https://github.com/apache/skywalking/discussions/
+ about: Ask a question or request support for using Apache SkyWalking
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 000000000000..fd1d6fd67dfe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,84 @@
+#
+# 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: SkyWalking feature request
+description: Suggest an idea for this project
+title: "[Feature] "
+labels: [ "feature" ]
+body:
+ - type: markdown
+ attributes:
+ value: |
+
+
+ Thank you for finding the time to propose new feature!
+
+ We really appreciate the community efforts to improve SkyWalking.
+
+ - type: checkboxes
+ attributes:
+ label: Search before asking
+ description: >
+ Please make sure to search in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) first to see
+ whether the same feature was requested already.
+ options:
+ - label: >
+ I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar
+ feature requirement.
+ required: true
+
+ - type: textarea
+ attributes:
+ label: Description
+ description: A short description of your feature
+
+ - type: textarea
+ attributes:
+ label: Use case
+ description: What do you want to happen?
+ placeholder: >
+ Rather than telling us how you might implement this feature, try to take a
+ step back and describe what you are trying to achieve.
+
+ - type: textarea
+ attributes:
+ label: Related issues
+ description: Is there currently another issue associated with this?
+
+ - type: checkboxes
+ attributes:
+ label: Are you willing to submit a pull request to implement this on your own?
+ description: >
+ This is absolutely not required, but we are happy to guide you in the contribution process
+ especially if you already have a good understanding of how to implement the feature.
+ SkyWalking is a totally community-driven project and we love to bring new contributors in.
+ Find us in #skywalking on Slack!
+ options:
+ - label: Yes I am willing to submit a pull request on my own!
+
+ - type: checkboxes
+ attributes:
+ label: Code of Conduct
+ description: The Code of Conduct helps create a safe space for everyone. We require
+ that everyone agrees to it.
+ options:
+ - label: |
+ I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
+ required: true
+
+ - type: markdown
+ attributes:
+ value: "Thanks for completing our form!"
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
new file mode 100644
index 000000000000..4501b45284fe
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+- [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #.
+- [ ] Update the [`CHANGES` log](https://github.com/apache/skywalking/blob/master/docs/en/changes/changes.md).
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
new file mode 100644
index 000000000000..59f762f808b6
--- /dev/null
+++ b/.github/workflows/codeql.yaml
@@ -0,0 +1,64 @@
+# 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: "CodeQL"
+
+on:
+ push:
+ branches: ["master"]
+ pull_request:
+ branches: ["master"]
+ paths:
+ - "**.java"
+ schedule:
+ - cron: "28 3 * * *"
+
+concurrency:
+ group: codeql-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
+permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+jobs:
+ analyze:
+ if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ name: Analyze
+ runs-on: ubuntu-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: ["java"]
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v3
+ with:
+ languages: ${{ matrix.language }}
+
+ - run: ./mvnw -q -Dmaven.test.skip=true clean install -Dgpg.skip || ./mvnw -q -Dmaven.test.skip=true clean install -Dgpg.skip
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/dead-link-checker.yaml b/.github/workflows/dead-link-checker.yaml
new file mode 100644
index 000000000000..b134daf30021
--- /dev/null
+++ b/.github/workflows/dead-link-checker.yaml
@@ -0,0 +1,41 @@
+# 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: Dead Link Checker
+
+on:
+ pull_request:
+ paths:
+ - 'docs/**'
+ schedule:
+ - cron: '0 18 * * *' # TimeZone: UTC 0
+
+concurrency:
+ group: dlc-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ CheckDeadLinks:
+ if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ steps:
+ - uses: actions/checkout@v4
+ - run: sudo npm install -g markdown-link-check@3.10.0
+ - run: |
+ for file in $(find . -name "*.md"); do
+ markdown-link-check -c .dlc.json -q "$file"
+ done
diff --git a/.github/workflows/publish-docker-e2e-service.yaml b/.github/workflows/publish-docker-e2e-service.yaml
new file mode 100644
index 000000000000..661053ec40ae
--- /dev/null
+++ b/.github/workflows/publish-docker-e2e-service.yaml
@@ -0,0 +1,64 @@
+# 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: Publish E2E service images
+
+on:
+ push:
+ branches:
+ - master
+ paths:
+ - 'test/e2e-v2/java-test-service/**'
+ - 'test/Makefile'
+
+env:
+ SKIP_TEST: true
+ HUB: ghcr.io/apache/skywalking
+
+jobs:
+ build:
+ if: github.repository == 'apache/skywalking'
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ packages: write
+ timeout-minutes: 90
+ env:
+ TAG: ${{ github.sha }}
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - name: Cache local Maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Log in to the Container registry
+ uses: docker/login-action@v1.10.0
+ with:
+ registry: ${{ env.HUB }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v3
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
+ - name: Build and push images
+ run: make -C test build.e2e-service docker.push-e2e-service
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
new file mode 100644
index 000000000000..c5bf734e54ab
--- /dev/null
+++ b/.github/workflows/publish-docker.yaml
@@ -0,0 +1,92 @@
+# 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: publish-docker
+
+on:
+ push:
+ branches:
+ - master
+ release:
+ types:
+ - released
+
+env:
+ SKIP_TEST: true
+
+jobs:
+ build:
+ if: github.repository == 'apache/skywalking'
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ packages: write
+ timeout-minutes: 90
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - name: Cache local Maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Set environment variables
+ run: |
+ if [[ ${{ github.event_name }} == "release" ]]; then
+ echo "HUB=apache" >> $GITHUB_ENV
+ echo "DOCKER_REGISTRY=docker.io" >> $GITHUB_ENV
+ echo "DOCKER_USERNAME=${{ secrets.DOCKERHUB_USER }}" >> $GITHUB_ENV
+ echo "DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }}" >> $GITHUB_ENV
+ echo "OAP_NAME=skywalking-oap-server" >> $GITHUB_ENV
+ echo "UI_NAME=skywalking-ui" >> $GITHUB_ENV
+ TAG=${{ github.event.release.tag_name }}
+ echo "TAG=${TAG#v}" >> $GITHUB_ENV
+ else
+ echo "HUB=ghcr.io/apache/skywalking" >> $GITHUB_ENV
+ echo "DOCKER_REGISTRY=ghcr.io/apache/skywalking" >> $GITHUB_ENV
+ echo "DOCKER_USERNAME=${{ github.actor }}" >> $GITHUB_ENV
+ echo "DOCKER_PASSWORD=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV
+ echo "TAG=${{ github.sha }}" >> $GITHUB_ENV
+ fi
+ - name: Log in to the Container registry
+ uses: docker/login-action@v3
+ with:
+ registry: ${{ env.DOCKER_REGISTRY }}
+ username: ${{ env.DOCKER_USERNAME }}
+ password: ${{ env.DOCKER_PASSWORD }}
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v3
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
+ - name: Build and push docker images based on Java 17
+ env:
+ SW_OAP_BASE_IMAGE: eclipse-temurin:17-jre
+ TAG: ${{ env.TAG }}-java17
+ run: make build.all docker.push
+ - name: Build and push docker images based on Java 21
+ env:
+ SW_OAP_BASE_IMAGE: eclipse-temurin:21-jre
+ TAG: ${{ env.TAG }}-java21
+ run: make build.all docker.push
+ - name: Build and push docker images
+ run: make build.all docker.push
+ - name: Build and push data-generator image
+ if: github.event_name != 'release'
+ run: make push.docker.data-generator
diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml
new file mode 100644
index 000000000000..e39032a5380d
--- /dev/null
+++ b/.github/workflows/skywalking.yaml
@@ -0,0 +1,1100 @@
+# 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: CI
+
+on:
+ pull_request:
+ schedule:
+ - cron: "0 18 * * *" # TimeZone: UTC 0
+
+concurrency:
+ group: skywalking-${{ github.event.pull_request.number || github.ref }}
+ cancel-in-progress: true
+
+env:
+ SW_AGENT_JDK_VERSION: 8
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+ SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5 # Cache restore timeout
+
+jobs:
+ license-header:
+ if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ name: License header
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - name: Check license header
+ uses: apache/skywalking-eyes@5b7ee1731d036b5aac68f8bd3fc9e6f98ada082e
+
+ code-style:
+ if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ name: Code style
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - name: Check code style
+ run: ./mvnw -B -q clean checkstyle:check
+
+ dependency-license:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.pom == 'true' || needs.changes.outputs.ui == 'true')
+ name: Dependency licenses
+ needs: [changes]
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - uses: actions/setup-java@v4
+ with:
+ distribution: "temurin"
+ java-version: "11"
+ cache: "maven"
+ - name: Setup Go
+ uses: actions/setup-go@v5
+ with:
+ go-version: "1.17"
+ - name: Check Dependencies Licenses
+ run: |
+ go install github.com/apache/skywalking-eyes/cmd/license-eye@5b7ee1731d036b5aac68f8bd3fc9e6f98ada082e
+ license-eye dependency resolve --summary ./dist-material/release-docs/LICENSE.tpl || exit 1
+ if [ ! -z "$(git diff -U0 ./dist-material/release-docs/LICENSE)" ]; then
+ echo "LICENSE file is not updated correctly"
+ git diff -U0 ./dist-material/release-docs/LICENSE
+ exit 1
+ fi
+
+ sanity-check:
+ if: ( always() && ! cancelled() ) && (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule')
+ name: Sanity check results
+ needs: [license-header, code-style, dependency-license]
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ steps:
+ - name: Check results
+ run: |
+ [[ ${{ needs.license-header.result }} == 'success' ]] || exit 1;
+ [[ ${{ needs.code-style.result }} == 'success' ]] || exit 1;
+ [[ ${{ needs.dependency-license.result }} == 'success' ]] || [[ ${{ needs.dependency-license.result }} == 'skipped' ]] || exit 1;
+
+ changes:
+ # Check if anything related to Actual code / CI(functional testing) is changed
+ # set outputs for other jobs to access for if conditions
+ runs-on: ubuntu-latest
+ # To prevent error when there's no base branch
+ if: github.event_name != 'schedule'
+ timeout-minutes: 10
+ outputs:
+ oap: ${{ steps.filter.outputs.oap }}
+ pom: ${{ steps.filter.outputs.pom }}
+ ui: ${{ steps.filter.outputs.ui }}
+ steps:
+ - uses: actions/checkout@v4 # required for push event
+ with:
+ fetch-depth: 0
+ submodules: true
+ persist-credentials: false
+ - name: Filter
+ id: filter
+ uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
+ with:
+ list-files: 'shell'
+ predicate-quantifier: 'every'
+ filters: |
+ oap:
+ - '!**/*.md'
+ - '!**/*.txt'
+ - '!skywalking-ui/**'
+ - '!.asf.yaml'
+ - '!.dlc.json'
+ - '!.gitignore'
+ - '!.licenserc.yaml'
+ - '!codeStyle.xml'
+ - '!HEADER'
+ - '!LICENSE'
+ - '!NOTICE'
+ - '!docs/**'
+ - '!.github/workflows/codeql.yaml'
+ - '!.github/ISSUE_TEMPLATE/**'
+ - '!.github/PULL_REQUEST_TEMPLATE'
+ - '!dist-material/release-docs/**'
+ - '!component-libraries.yml'
+ pom:
+ - '**/pom.xml'
+ ui: # dorny/paths-filter doesn't support submodule changes detection, anyway keep it here to remind us of https://github.com/dorny/paths-filter/issues/143
+ - 'skywalking-ui/**'
+ - name: List all modified files
+ if: steps.filter.outputs.oap == 'true' || steps.filter.outputs.pom == 'true' || steps.filter.outputs.pom == 'true'
+ run: |
+ echo "Files that have changed or modified:"
+ echo "OAP: ${{ steps.filter.outputs.oap_files }}"
+ echo "POM: ${{ steps.filter.outputs.pom_files }}"
+ echo "UI: ${{ steps.filter.outputs.ui_files }}"
+
+ dist-tar:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: Build dist tar
+ needs: [changes]
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - uses: actions/setup-java@v4
+ with:
+ distribution: "temurin"
+ java-version: "11"
+ cache: "maven"
+ - name: Build distribution tar
+ run: |
+ ./mvnw clean flatten:flatten install javadoc:javadoc -B -q -Pall \
+ -Dmaven.test.skip \
+ -Dcheckstyle.skip \
+ -Dgpg.skip
+ - name: Verify builds are reproducible
+ run: ./mvnw -Dmaven.test.skip clean flatten:flatten verify artifact:compare -Pall -Dgpg.skip
+ - uses: actions/upload-artifact@v4
+ name: Upload distribution tar
+ with:
+ name: dist
+ path: dist
+
+ docker:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: Docker images
+ needs: [sanity-check, dist-tar, changes]
+ runs-on: ubuntu-latest
+ timeout-minutes: 30
+ strategy:
+ matrix:
+ java-version: [11, 17]
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - uses: actions/download-artifact@v4
+ name: Download distribution tar
+ with:
+ name: dist
+ path: dist
+ - name: Set up Java
+ uses: actions/setup-java@v4
+ with:
+ distribution: temurin
+ java-version: ${{ matrix.java-version }}
+ - name: Build and save docker images
+ env:
+ SW_OAP_BASE_IMAGE: eclipse-temurin:${{ matrix.java-version }}-jre
+ run: |
+ make docker.all || make docker.all
+ docker save -o docker-images-skywalking-oap.tar skywalking/oap:latest
+ docker save -o docker-images-skywalking-ui.tar skywalking/ui:latest
+ - name: Upload docker images
+ uses: actions/upload-artifact@v4
+ with:
+ name: docker-images-${{ matrix.java-version }}
+ path: docker-images-skywalking-*.tar
+
+ unit-test:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: Unit test
+ needs: [sanity-check, changes]
+ runs-on: ${{ matrix.os }}
+ timeout-minutes: 30
+ strategy:
+ matrix:
+ os: [ubuntu-latest, macos-14, windows-latest]
+ java-version: [11]
+ include:
+ - os: ubuntu-latest
+ java-version: 17
+ - os: ubuntu-latest
+ java-version: 21
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - name: Cache maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+ - uses: actions/setup-java@v4
+ with:
+ java-version: ${{ matrix.java-version }}
+ distribution: temurin
+ - name: Unit test
+ run: ./mvnw clean test -q -B -D"checkstyle.skip" || ./mvnw clean test -q -B -D"checkstyle.skip"
+
+ integration-test:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: Integration test
+ needs: [sanity-check, changes]
+ runs-on: ubuntu-latest
+ timeout-minutes: 60
+ strategy:
+ matrix:
+ java-version: [11, 17, 21]
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - name: Cache maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+ - uses: actions/setup-java@v4
+ with:
+ java-version: ${{ matrix.java-version }}
+ distribution: temurin
+ - name: Integration test
+ run: |
+ # Exclude slow integration tests and run those tests separately below.
+ ./mvnw -B clean integration-test -Dcheckstyle.skip -DskipUTs=true -DexcludedGroups=slow || \
+ ./mvnw -B clean integration-test -Dcheckstyle.skip -DskipUTs=true -DexcludedGroups=slow
+
+ # Slow tests
+ slow-integration-test:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: Slow Integration Tests
+ needs: [sanity-check, changes]
+ runs-on: ubuntu-latest
+ timeout-minutes: 60
+ strategy:
+ matrix:
+ test:
+ - name: ElasticSearch / OpenSearch
+ class: org.apache.skywalking.library.elasticsearch.ElasticSearchIT
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - name: Cache maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+ - uses: actions/setup-java@v4
+ with:
+ java-version: 11
+ distribution: temurin
+ - name: ${{ matrix.test.name }}
+ run: |
+ ./mvnw -B clean integration-test -Dcheckstyle.skip -DskipUTs=true -Dit.test=${{ matrix.test.class }} -Dfailsafe.failIfNoSpecifiedTests=false || \
+ ./mvnw -B clean integration-test -Dcheckstyle.skip -DskipUTs=true -Dit.test=${{ matrix.test.class }} -Dfailsafe.failIfNoSpecifiedTests=false
+
+ e2e-test:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: E2E test
+ needs: [docker, dist-tar]
+ runs-on: ${{ matrix.test.runs-on || 'ubuntu-latest' }}
+ timeout-minutes: 60
+ env:
+ OTEL_COLLECTOR_VERSION: 0.102.1
+ strategy:
+ fail-fast: false
+ matrix:
+ test:
+ - name: Cluster ZK/ES
+ config: test/e2e-v2/cases/cluster/zk/es/e2e.yaml
+
+ - name: Agent NodeJS Backend
+ config: test/e2e-v2/cases/nodejs/e2e.yaml
+ - name: Agent Golang
+ config: test/e2e-v2/cases/go/e2e.yaml
+ - name: Agent NodeJS Frontend
+ config: test/e2e-v2/cases/browser/e2e.yaml
+ - name: Agent NodeJS Frontend ES
+ config: test/e2e-v2/cases/browser/es/e2e.yaml
+ - name: Agent NodeJS Frontend ES Sharding
+ config: test/e2e-v2/cases/browser/es/es-sharding/e2e.yaml
+ - name: Agent PHP
+ config: test/e2e-v2/cases/php/e2e.yaml
+ - name: Agent Python
+ config: test/e2e-v2/cases/python/e2e.yaml
+ - name: Agent Lua
+ config: test/e2e-v2/cases/lua/e2e.yaml
+
+ - name: BanyanDB
+ config: test/e2e-v2/cases/storage/banyandb/e2e.yaml
+ - name: BanyanDB TLS
+ config: test/e2e-v2/cases/storage/banyandb/tls/e2e.yaml
+ - name: Storage MySQL
+ config: test/e2e-v2/cases/storage/mysql/e2e.yaml
+ - name: Storage PostgreSQL
+ config: test/e2e-v2/cases/storage/postgres/e2e.yaml
+ - name: Storage ES 7.16.3
+ config: test/e2e-v2/cases/storage/es/e2e.yaml
+ env: ES_VERSION=7.16.3
+ - name: Storage ES 7.17.10
+ config: test/e2e-v2/cases/storage/es/e2e.yaml
+ env: ES_VERSION=7.17.10
+ - name: Storage ES 8.1.0
+ config: test/e2e-v2/cases/storage/es/e2e.yaml
+ env: ES_VERSION=8.1.0
+ - name: Storage ES 8.9.0
+ config: test/e2e-v2/cases/storage/es/e2e.yaml
+ env: ES_VERSION=8.9.0
+ - name: Storage OpenSearch 1.1.0
+ config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.1.0
+ - name: Storage OpenSearch 1.3.10
+ config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.3.10
+ - name: Storage OpenSearch 2.4.0
+ config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=2.4.0
+ - name: Storage OpenSearch 2.8.0
+ config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=2.8.0
+ - name: Storage OpenSearch 3.0.0
+ config: test/e2e-v2/cases/storage/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=3.0.0
+ - name: Storage ES Sharding
+ config: test/e2e-v2/cases/storage/es/es-sharding/e2e.yaml
+
+ - name: Alarm ES
+ config: test/e2e-v2/cases/alarm/es/e2e.yaml
+ - name: Alarm ES Sharding
+ config: test/e2e-v2/cases/alarm/es/es-sharding/e2e.yaml
+ - name: Alarm MySQL
+ config: test/e2e-v2/cases/alarm/mysql/e2e.yaml
+ - name: Alarm PostgreSQL
+ config: test/e2e-v2/cases/alarm/postgres/e2e.yaml
+ - name: Alarm BanyanDB
+ config: test/e2e-v2/cases/alarm/banyandb/e2e.yaml
+
+ - name: Baseline-driven Alarm ES
+ config: test/e2e-v2/cases/baseline/es/e2e.yaml
+ - name: Baseline-driven Alarm ES Sharding
+ config: test/e2e-v2/cases/baseline/es/es-sharding/e2e.yaml
+ - name: Baseline-driven Alarm BanyanDB
+ config: test/e2e-v2/cases/baseline/banyandb/e2e.yaml
+
+ - name: TTL ES 7.16.3
+ config: test/e2e-v2/cases/ttl/es/e2e.yaml
+ env: ES_VERSION=7.16.3
+ - name: TTL ES 8.8.1
+ config: test/e2e-v2/cases/ttl/es/e2e.yaml
+ env: ES_VERSION=8.8.1
+
+ - name: Event BanyanDB
+ config: test/e2e-v2/cases/event/banyandb/e2e.yaml
+ - name: Event ES
+ config: test/e2e-v2/cases/event/es/e2e.yaml
+ - name: Event MySQL
+ config: test/e2e-v2/cases/event/mysql/e2e.yaml
+
+ - name: Log MySQL
+ config: test/e2e-v2/cases/log/mysql/e2e.yaml
+ - name: Log PostgreSQL
+ config: test/e2e-v2/cases/log/postgres/e2e.yaml
+ - name: Log ES 7.16.3
+ config: test/e2e-v2/cases/log/es/e2e.yaml
+ env: ES_VERSION=7.16.3
+ - name: Log ES 7.17.10
+ config: test/e2e-v2/cases/log/es/e2e.yaml
+ env: ES_VERSION=7.17.10
+ - name: Log ES 8.8.1 Sharding
+ config: test/e2e-v2/cases/log/es/es-sharding/e2e.yaml
+ env: ES_VERSION=8.8.1
+ - name: Log BanyanDB
+ config: test/e2e-v2/cases/log/banyandb/e2e.yaml
+
+ - name: Log FluentBit ES 7.16.3
+ config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
+ env: ES_VERSION=7.16.3
+ - name: Log FluentBit ES 7.17.10
+ config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
+ env: ES_VERSION=7.17.10
+ - name: Log FluentBit ES 8.8.1
+ config: test/e2e-v2/cases/log/fluent-bit/e2e.yaml
+ env: ES_VERSION=8.8.1
+
+ - name: Trace Profiling BanyanDB
+ config: test/e2e-v2/cases/profiling/trace/banyandb/e2e.yaml
+ - name: Trace Profiling ES
+ config: test/e2e-v2/cases/profiling/trace/es/e2e.yaml
+ - name: Trace Profiling ES Sharding
+ config: test/e2e-v2/cases/profiling/trace/es/es-sharding/e2e.yaml
+ - name: Trace Profiling MySQL
+ config: test/e2e-v2/cases/profiling/trace/mysql/e2e.yaml
+ - name: Trace Profiling Postgres
+ config: test/e2e-v2/cases/profiling/trace/postgres/e2e.yaml
+ - name: Trace Profiling OpenSearch 1.1.0
+ config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.1.0
+ - name: Trace Profiling OpenSearch 1.3.6
+ config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.3.6
+ - name: Trace Profiling OpenSearch 2.4.0
+ config: test/e2e-v2/cases/profiling/trace/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=2.4.0
+
+ - name: eBPF Profiling On CPU BanyanDB
+ config: test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/oncpu/
+ file: Dockerfile.sqrt
+ name: test/oncpu:test
+ - name: eBPF Profiling On CPU ES
+ config: test/e2e-v2/cases/profiling/ebpf/oncpu/es/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/oncpu/
+ file: Dockerfile.sqrt
+ name: test/oncpu:test
+ - name: eBPF Profiling On CPU ES Sharding
+ config: test/e2e-v2/cases/profiling/ebpf/oncpu/es/es-sharding/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/oncpu/
+ file: Dockerfile.sqrt
+ name: test/oncpu:test
+ - name: eBPF Profiling Off CPU
+ config: test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/offcpu/
+ file: Dockerfile.file
+ name: test/offcpu:test
+ runs-on: ubuntu-24.04
+
+ - name: eBPF Profiling Network BanyanDB
+ config: test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/network/
+ file: Dockerfile.service
+ name: test/network:test
+ - name: eBPF Profiling Network ES
+ config: test/e2e-v2/cases/profiling/ebpf/network/es/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/network/
+ file: Dockerfile.service
+ name: test/network:test
+ - name: eBPF Profiling Network ES Sharding
+ config: test/e2e-v2/cases/profiling/ebpf/network/es/es-sharding/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/network/
+ file: Dockerfile.service
+ name: test/network:test
+
+ - name: Continuous Profiling BanyanDB
+ config: test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/continuous/
+ file: Dockerfile.sqrt
+ name: test/continuous:test
+ - name: Continuous Profiling ES
+ config: test/e2e-v2/cases/profiling/ebpf/continuous/es/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/continuous/
+ file: Dockerfile.sqrt
+ name: test/continuous:test
+ - name: Continuous Profiling Sharding ES
+ config: test/e2e-v2/cases/profiling/ebpf/continuous/es/es-sharding/e2e.yaml
+ docker:
+ base: test/e2e-v2/cases/profiling/ebpf/continuous/
+ file: Dockerfile.sqrt
+ name: test/continuous:test
+
+ # eBPF Access Log
+ - name: eBPF Access Log BanyanDB
+ config: test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml
+ - name: eBPF Access Log ES
+ config: test/e2e-v2/cases/profiling/ebpf/access_log/es/e2e.yaml
+ - name: eBPF Access Log ES Sharding
+ config: test/e2e-v2/cases/profiling/ebpf/access_log/es/es-sharding/e2e.yaml
+
+ - name: Kafka Basic
+ config: test/e2e-v2/cases/kafka/simple-so11y/e2e.yaml
+ - name: Kafka Profiling
+ config: test/e2e-v2/cases/kafka/profile/e2e.yaml
+ - name: Kafka Meter
+ config: test/e2e-v2/cases/kafka/meter/e2e.yaml
+ - name: Kafka Log
+ config: test/e2e-v2/cases/kafka/log/e2e.yaml
+
+ - name: Istio Metrics Service 1.20.0
+ config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+ env: |
+ ISTIO_VERSION=1.20.0
+ KUBERNETES_VERSION=28
+ - name: Istio Metrics Service 1.21.0
+ config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+ env: |
+ ISTIO_VERSION=1.21.0
+ KUBERNETES_VERSION=28
+ - name: Istio Metrics Service 1.22.0
+ config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+ env: |
+ ISTIO_VERSION=1.22.0
+ KUBERNETES_VERSION=28
+ - name: Istio Metrics Service 1.23.0
+ config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+ env: |
+ ISTIO_VERSION=1.23.0
+ KUBERNETES_VERSION=28
+ - name: Istio Metrics Service 1.24.0
+ config: test/e2e-v2/cases/istio/metrics/e2e.yaml
+ env: |
+ ISTIO_VERSION=1.24.0
+ KUBERNETES_VERSION=28
+
+ - name: Rover with Istio Process 1.15.0
+ config: test/e2e-v2/cases/rover/process/istio/e2e.yaml
+ env: ISTIO_VERSION=1.15.0
+ runs-on: ubuntu-24.04
+
+ - name: Satellite
+ config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml
+ - name: Auth
+ config: test/e2e-v2/cases/simple/auth/e2e.yaml
+ - name: SSL
+ config: test/e2e-v2/cases/simple/ssl/e2e.yaml
+ - name: mTLS
+ config: test/e2e-v2/cases/simple/mtls/e2e.yaml
+ - name: Virtual Gateway
+ config: test/e2e-v2/cases/gateway/e2e.yaml
+ - name: Meter
+ config: test/e2e-v2/cases/meter/e2e.yaml
+ - name: VM Zabbix
+ config: test/e2e-v2/cases/vm/zabbix/e2e.yaml
+ - name: VM Prometheus
+ config: test/e2e-v2/cases/vm/prometheus-node-exporter/e2e.yaml
+ - name: VM Telegraf
+ config: test/e2e-v2/cases/vm/telegraf/e2e.yaml
+ - name: So11y
+ config: test/e2e-v2/cases/so11y/e2e.yaml
+ - name: MySQL Prometheus and slowsql
+ config: test/e2e-v2/cases/mysql/mysql-slowsql/e2e.yaml
+ - name: PostgreSQL Prometheus
+ config: test/e2e-v2/cases/postgresql/postgres-exporter/e2e.yaml
+ - name: MariaDB Prometheus and slowsql
+ config: test/e2e-v2/cases/mariadb/mariadb-slowsql/e2e.yaml
+
+ - name: Zipkin ES
+ config: test/e2e-v2/cases/zipkin/es/e2e.yaml
+ - name: Zipkin ES Sharding
+ config: test/e2e-v2/cases/zipkin/es/es-sharding/e2e.yaml
+ - name: Zipkin MySQL
+ config: test/e2e-v2/cases/zipkin/mysql/e2e.yaml
+ - name: Zipkin Opensearch
+ config: test/e2e-v2/cases/zipkin/opensearch/e2e.yaml
+ - name: Zipkin Postgres
+ config: test/e2e-v2/cases/zipkin/postgres/e2e.yaml
+ - name: Zipkin Kafka
+ config: test/e2e-v2/cases/zipkin/kafka/e2e.yaml
+ - name: Zipkin BanyanDB
+ config: test/e2e-v2/cases/zipkin/banyandb/e2e.yaml
+
+ - name: Nginx
+ config: test/e2e-v2/cases/nginx/e2e.yaml
+ - name: APISIX metrics
+ config: test/e2e-v2/cases/apisix/otel-collector/e2e.yaml
+ - name: Exporter Kafka
+ config: test/e2e-v2/cases/exporter/kafka/e2e.yaml
+ - name: Virtual MQ
+ config: test/e2e-v2/cases/virtual-mq/e2e.yaml
+ - name: AWS Cloud EKS
+ config: test/e2e-v2/cases/aws/eks/e2e.yaml
+ - name: Windows
+ config: test/e2e-v2/cases/win/e2e.yaml
+ - name: AWS Cloud S3
+ config: test/e2e-v2/cases/aws/s3/e2e.yaml
+ - name: AWS Cloud DynamoDB
+ config: test/e2e-v2/cases/aws/dynamodb/e2e.yaml
+ - name: PromQL Service
+ config: test/e2e-v2/cases/promql/e2e.yaml
+ - name: LogQL Service
+ config: test/e2e-v2/cases/logql/e2e.yaml
+ - name: AWS API Gateway
+ config: test/e2e-v2/cases/aws/api-gateway/e2e.yaml
+ - name: Redis Prometheus and Log Collecting
+ config: test/e2e-v2/cases/redis/redis-exporter/e2e.yaml
+ - name: Elasticsearch
+ config: test/e2e-v2/cases/elasticsearch/e2e.yaml
+ - name: MongoDB
+ config: test/e2e-v2/cases/mongodb/e2e.yaml
+ - name: RabbitMQ
+ config: test/e2e-v2/cases/rabbitmq/e2e.yaml
+ - name: Kafka
+ config: test/e2e-v2/cases/kafka/kafka-monitoring/e2e.yaml
+ - name: MQE Service
+ config: test/e2e-v2/cases/mqe/e2e.yaml
+ - name: Pulsar and BookKeeper
+ config: test/e2e-v2/cases/pulsar/e2e.yaml
+ - name: RocketMQ
+ config: test/e2e-v2/cases/rocketmq/e2e.yaml
+ - name: ClickHouse
+ config: test/e2e-v2/cases/clickhouse/clickhouse-prometheus-endpoint/e2e.yaml
+ - name: ActiveMQ
+ config: test/e2e-v2/cases/activemq/e2e.yaml
+ - name: Kong
+ config: test/e2e-v2/cases/kong/e2e.yaml
+ - name: Flink
+ config: test/e2e-v2/cases/flink/e2e.yaml
+
+ - name: UI Menu BanyanDB
+ config: test/e2e-v2/cases/menu/banyandb/e2e.yaml
+ - name: UI Menu ES
+ config: test/e2e-v2/cases/menu/es/e2e.yaml
+ - name: UI Menu Sharding ES
+ config: test/e2e-v2/cases/menu/es/es-sharding/e2e.yaml
+ - name: UI Menu MySQL
+ config: test/e2e-v2/cases/menu/mysql/e2e.yaml
+ - name: UI Menu Postgres
+ config: test/e2e-v2/cases/menu/postgres/e2e.yaml
+ - name: UI Menu OpenSearch 1.1.0
+ config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.1.0
+ - name: UI Menu OpenSearch 1.3.6
+ config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=1.3.6
+ - name: UI Menu OpenSearch 2.4.0
+ config: test/e2e-v2/cases/menu/opensearch/e2e.yaml
+ env: OPENSEARCH_VERSION=2.4.0
+
+ - name: OTLP Trace
+ config: test/e2e-v2/cases/otlp-traces/e2e.yaml
+
+ - name: Cilium Service
+ config: test/e2e-v2/cases/cilium/e2e.yaml
+
+ - name: Async Profiler ES
+ config: test/e2e-v2/cases/profiling/async-profiler/es/e2e.yaml
+ - name: Async Profiler BanyanDB
+ config: test/e2e-v2/cases/profiling/async-profiler/banyandb/e2e.yaml
+ - name: Async Profiler MySQL
+ config: test/e2e-v2/cases/profiling/async-profiler/mysql/e2e.yaml
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
+ - uses: apache/skywalking-cli/actions/setup@master
+ with:
+ version: ${{ env.SW_CTL_COMMIT }}
+ - uses: actions/download-artifact@v4
+ name: Download docker images
+ with:
+ name: docker-images-11
+ path: docker-images
+ - name: Load docker images
+ run: |
+ find docker-images -name "*.tar" -exec docker load -i {} \;
+ find docker-images -name "*.tar" -exec rm {} \;
+ - uses: actions/download-artifact@v4
+ name: Download distribution tar
+ with:
+ name: dist
+ path: dist
+ - name: Login to ghcr
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Cache maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('test/e2e-v2/java-test-service/**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+ - name: Prepare test services
+ shell: bash
+ run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean flatten:flatten package
+ - name: Set env var
+ run: |
+ echo "${{ matrix.test.env }}" >> $GITHUB_ENV
+ - name: Build test image
+ if: matrix.test.docker != null
+ run: docker build -t ${{ matrix.test.docker.name }} -f ${{ matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{ matrix.test.docker.base }}
+ - name: ${{ matrix.test.name }}
+ uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
+ with:
+ e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
+ - if: ${{ failure() }}
+ run: |
+ df -h
+ du -sh .
+ docker images
+ - uses: actions/upload-artifact@v4
+ if: ${{ failure() }}
+ name: Upload Logs
+ with:
+ name: test-logs-${{ matrix.test.name }}
+ path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
+
+ e2e-test-istio:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: E2E test
+ needs: [docker]
+ runs-on: ubuntu-24.04
+ timeout-minutes: 60
+ strategy:
+ fail-fast: false
+ matrix:
+ analyzer: [k8s-mesh, mx-mesh]
+ versions:
+ - istio: 1.20.0
+ kubernetes: 28
+ - istio: 1.21.0
+ kubernetes: 28
+ - istio: 1.22.0
+ kubernetes: 28
+ - istio: 1.23.0
+ kubernetes: 28
+ - istio: 1.24.0
+ kubernetes: 28
+
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
+ - uses: apache/skywalking-cli/actions/setup@master
+ with:
+ version: ${{ env.SW_CTL_COMMIT }}
+ - uses: actions/download-artifact@v4
+ name: Download docker images
+ with:
+ name: docker-images-11
+ path: docker-images
+ - name: Load docker images
+ run: |
+ find docker-images -name "*.tar" -exec docker load -i {} \;
+ find docker-images -name "*.tar" -exec rm {} \;
+ - name: Login to ghcr
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: ${{ matrix.test.name }}
+ uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
+ env:
+ ISTIO_VERSION: ${{ matrix.versions.istio }}
+ KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
+ ALS_ANALYZER: ${{ matrix.analyzer }}
+ with:
+ e2e-file: test/e2e-v2/cases/istio/als/e2e.yaml
+ - if: ${{ failure() }}
+ run: |
+ df -h
+ du -sh .
+ docker images
+ - uses: actions/upload-artifact@v4
+ if: ${{ failure() }}
+ name: Upload Logs
+ with:
+ name: test-logs-${{ matrix.test.name }}
+ path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
+
+ e2e-test-istio-ambient:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: E2E test
+ needs: [docker]
+ runs-on: ubuntu-24.04
+ timeout-minutes: 60
+ strategy:
+ fail-fast: false
+ matrix:
+ analyzer: [k8s-mesh, mx-mesh]
+ versions:
+ - istio: 1.23.0
+ kubernetes: 28
+ - istio: 1.24.0
+ kubernetes: 28
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
+ - uses: apache/skywalking-cli/actions/setup@master
+ with:
+ version: ${{ env.SW_CTL_COMMIT }}
+ - uses: actions/download-artifact@v4
+ name: Download docker images
+ with:
+ name: docker-images-11
+ path: docker-images
+ - name: Load docker images
+ run: |
+ find docker-images -name "*.tar" -exec docker load -i {} \;
+ find docker-images -name "*.tar" -exec rm {} \;
+ - name: Login to ghcr
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: ${{ matrix.test.name }}
+ uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
+ env:
+ ISTIO_VERSION: ${{ matrix.versions.istio }}
+ KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
+ ALS_ANALYZER: ${{ matrix.analyzer }}
+ with:
+ e2e-file: test/e2e-v2/cases/istio/ambient-als/e2e.yaml
+ - if: ${{ failure() }}
+ run: |
+ df -h
+ du -sh .
+ docker images
+ - uses: actions/upload-artifact@v4
+ if: ${{ failure() }}
+ name: Upload Logs
+ with:
+ name: test-istio-ambient-logs-${{ matrix.versions.istio }}-${{ matrix.versions.kubernetes }}-${{ matrix.analyzer }}
+ path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
+
+ e2e-test-java-versions:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: E2E test
+ needs: [docker]
+ runs-on: ubuntu-latest
+ timeout-minutes: 60
+ strategy:
+ fail-fast: false
+ matrix:
+ java-version: [11, 17]
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
+ - uses: apache/skywalking-cli/actions/setup@master
+ with:
+ version: ${{ env.SW_CTL_COMMIT }}
+ - uses: actions/download-artifact@v4
+ name: Download docker images
+ with:
+ name: docker-images-${{ matrix.java-version }}
+ path: docker-images
+ - name: Load docker images
+ run: |
+ find docker-images -name "*.tar" -exec docker load -i {} \;
+ find docker-images -name "*.tar" -exec rm {} \;
+ - uses: actions/setup-java@v4
+ with:
+ java-version: ${{ matrix.java-version }}
+ distribution: temurin
+ - name: Cache maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('test/e2e-v2/java-test-service/**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+ - name: Prepare test services
+ shell: bash
+ run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean package
+ - name: Java version ${{ matrix.java-version }}
+ uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
+ env:
+ SW_AGENT_JDK_VERSION: ${{ matrix.java-version }}
+ with:
+ e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/simple/jdk/e2e.yaml
+
+ e2e-test-banyandb-stages:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: E2E test
+ needs: [docker, dist-tar]
+ runs-on: ${{ matrix.test.runs-on || 'ubuntu-latest' }}
+ timeout-minutes: 60
+ env:
+ BANYANDB_DATA_GENERATE_ROOT: test/e2e-v2/cases/storage/banyandb/data-generate
+ strategy:
+ fail-fast: false
+ matrix:
+ test:
+ - name: BanyanDB Stages
+ config: test/e2e-v2/cases/storage/banyandb/stages/e2e.yaml
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
+ - uses: apache/skywalking-cli/actions/setup@master
+ with:
+ version: ${{ env.SW_CTL_COMMIT }}
+ - uses: actions/download-artifact@v4
+ name: Download docker images
+ with:
+ name: docker-images-11
+ path: docker-images
+ - name: Load docker images
+ run: |
+ find docker-images -name "*.tar" -exec docker load -i {} \;
+ find docker-images -name "*.tar" -exec rm {} \;
+ - uses: actions/download-artifact@v4
+ name: Download distribution tar
+ with:
+ name: dist
+ path: dist
+ - name: Login to ghcr
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Cache maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('test/e2e-v2/java-test-service/**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+ - name: Prepare test services
+ shell: bash
+ run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean flatten:flatten package
+ - name: Set env var
+ run: |
+ echo "${{ matrix.test.env }}" >> $GITHUB_ENV
+ - name: Build test image
+ if: matrix.test.docker != null
+ run: docker build -t ${{ matrix.test.docker.name }} -f ${{ matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{ matrix.test.docker.base }}
+ - name: Generate BanyanDB cold data
+ run: |
+ export $(grep -v '^#' test/e2e-v2/script/env | xargs)
+ docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml up -d
+ CONTAINER_ID=$(docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml ps -q banyandb)
+ echo "⌛ monitoring segment files..."
+ found=false
+ for i in {1..60}; do
+ # check if segment files exist
+ if docker exec $CONTAINER_ID sh -c '[ -n "$(ls /tmp/measure-data/measure/data/metricsDay/seg* 2>/dev/null)" ]'; then
+ echo "✅ found segment files"
+ sleep 180
+ # create and copy files
+ docker cp $CONTAINER_ID:/tmp ${BANYANDB_DATA_GENERATE_ROOT}
+ docker cp $CONTAINER_ID:/tmp/measure-data/measure/data/metadata ${BANYANDB_DATA_GENERATE_ROOT}
+ found=true
+ break
+ else
+ echo "⏳ didn't find segment files (retry $i/60)"
+ sleep 10
+ fi
+ done
+ if $found; then
+ echo "✅ segment files copied to ${BANYANDB_DATA_GENERATE_ROOT}"
+ else
+ echo "❌ segment files not found"
+ exit 1
+ fi
+ docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml down -v
+ - name: ${{ matrix.test.name }}
+ uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
+ with:
+ e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
+ - if: ${{ failure() }}
+ run: |
+ df -h
+ du -sh .
+ docker images
+ - uses: actions/upload-artifact@v4
+ if: ${{ failure() }}
+ name: Upload Logs
+ with:
+ name: test-logs-${{ matrix.test.name }}
+ path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
+
+ required:
+ if: always()
+ name: Required
+ needs:
+ - dependency-license
+ - unit-test
+ - integration-test
+ - slow-integration-test
+ - e2e-test
+ - e2e-test-istio
+ - e2e-test-istio-ambient
+ - e2e-test-java-versions
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ steps:
+ - name: Merge Requirement
+ # check changes, sanity, dependency license, unit, integration, e2e, e2e-istio and e2e-java-versions,
+ # if all of them are working as expected then naturally exits else return error code
+ run: |
+ execute=${{ needs.changes.outputs.oap }}
+
+ sanityResults=${{ needs.dependency-license.result }}
+ [[ ${sanityResults} == 'success' ]] || [[ ${execute} != 'true' && ${sanityResults} == 'skipped' ]] || exit -1;
+
+ depLicenseResults=${{ needs.dependency-license.result }}
+ unitResults=${{ needs.unit-test.result }};
+ integrationResults=${{ needs.integration-test.result }};
+ timeConsumingITResults=${{ needs.slow-integration-test.result }};
+ e2eResults=${{ needs.e2e-test.result }};
+ e2eIstioResults=${{ needs.e2e-test-istio.result }};
+ e2eIstioAmbientResults=${{ needs.e2e-test-istio-ambient.result }};
+ e2eJavaVersionResults=${{ needs.e2e-test-java-versions.result }};
+
+ [[ ${depLicenseResults} == 'success' ]] || [[ ${execute} != 'true' && ${depLicenseResults} == 'skipped' ]] || exit -2;
+ [[ ${unitResults} == 'success' ]] || [[ ${execute} != 'true' && ${unitResults} == 'skipped' ]] || exit -3;
+ [[ ${integrationResults} == 'success' ]] || [[ ${execute} != 'true' && ${integrationResults} == 'skipped' ]] || exit -4;
+ [[ ${e2eResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eResults} == 'skipped' ]] || exit -5;
+ [[ ${e2eIstioResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioResults} == 'skipped' ]] || exit -6;
+ [[ ${e2eIstioAmbientResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eIstioAmbientResults} == 'skipped' ]] || exit -6;
+ [[ ${e2eJavaVersionResults} == 'success' ]] || [[ ${execute} != 'true' && ${e2eJavaVersionResults} == 'skipped' ]] || exit -7;
+ [[ ${timeConsumingITResults} == 'success' ]] || [[ ${execute} != 'true' && ${timeConsumingITResults} == 'skipped' ]] || exit -8;
+
+ exit 0;
diff --git a/.gitignore b/.gitignore
index bdc57edb2660..35217509472d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/build/
target/
.idea/
+.flattened-pom.xml
*.iml
.classpath
.project
@@ -9,3 +10,22 @@ target/
*~
packages/
**/dependency-reduced-pom.xml
+**/dist/
+/docker/snapshot/*.gz
+.mvn/wrapper/*.jar
+OALLexer.tokens
+.factorypath
+.vscode
+.checkstyle
+.externalToolBuilders
+oap-server/oal-grammar/**/gen/
+MQELexer.tokens
+oap-server/mqe-grammar/**/gen/
+PromQLLexer.tokens
+oap-server/server-query-plugin/promql-plugin/gen/
+LogQLLexer.tokens
+oap-server/server-query-plugin/logql-plugin/gen/
+
+# This serves as a template but will ONLY be updated when building a source release tar,
+# so we don't track future updates of this file.
+oap-server/server-starter/src/main/resources/version.properties
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000000..8011ff2bf149
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "apm-protocol/apm-network/src/main/proto"]
+ path = apm-protocol/apm-network/src/main/proto
+ url = https://github.com/apache/skywalking-data-collect-protocol.git
+[submodule "oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol"]
+ path = oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
+ url = https://github.com/apache/skywalking-query-protocol.git
+[submodule "test/e2e-v2/java-test-service/e2e-protocol/src/main/proto"]
+ path = test/e2e-v2/java-test-service/e2e-protocol/src/main/proto
+ url = https://github.com/apache/skywalking-data-collect-protocol.git
+[submodule "skywalking-ui"]
+ path = skywalking-ui
+ url = https://github.com/apache/skywalking-booster-ui.git
diff --git a/.licenserc.yaml b/.licenserc.yaml
new file mode 100644
index 000000000000..310b12c5ea6e
--- /dev/null
+++ b/.licenserc.yaml
@@ -0,0 +1,147 @@
+#
+# 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.
+#
+header:
+ license:
+ spdx-id: Apache-2.0
+ copyright-owner: Apache Software Foundation
+
+ paths-ignore:
+ - '.github/ISSUE_TEMPLATE'
+ - '.github/PULL_REQUEST_TEMPLATE'
+ - '**/.gitignore'
+ - '.gitmodules'
+ - '.lift'
+ - '.mvn'
+ - 'apm-protocol/apm-network/src/main/proto/.gitignore'
+ - 'codeStyle.xml'
+ - 'docker/.env'
+ - 'dist'
+ - 'licenses'
+ - 'dist-material/release-docs'
+ - '**/*.md'
+ - '**/*.json'
+ - '**/*.ftl'
+ - '**/target/**'
+ - '**/*.iml'
+ - '**/*.ini'
+ - '**/*.crt'
+ - '**/*.pem'
+ - '**/*.key'
+ - '**/*.txt'
+ - 'LICENSE'
+ - 'NOTICE'
+ - 'skywalking-ui/dist'
+ - 'skywalking-ui/node_modules'
+ - 'skywalking-ui/node'
+ - 'skywalking-ui/.browserslistrc'
+ - 'skywalking-ui/.prettierrc'
+ - 'skywalking-ui/src/types/auto-imports.d.ts'
+ - 'skywalking-ui/src/types/components.d.ts'
+ - '**/src/main/fbs/istio/**'
+ - '**/src/main/proto/envoy/**'
+ - '**/src/main/proto/udpa/**'
+ - '**/src/main/proto/google/**'
+ - '**/src/main/proto/istio/**'
+ - '**/src/main/proto/jaeger/**'
+ - '**/src/main/proto/mixer/**'
+ - '**/src/main/proto/policy/**'
+ - '**/src/main/proto/cilium/**'
+ - '**/src/main/proto/prometheus/client_model/metrics.proto'
+ - '**/src/main/proto/protoc-gen-swagger/**'
+ - '**/src/main/proto/validate/validate.proto'
+ - '**/src/main/proto/opentelemetry/**'
+ - 'oap-server/server-starter/src/main/resources/version.properties'
+ - '**/mockito-extensions/**'
+ - 'oap-server/server-library/library-async-profiler-jfr-parser'
+ - 'docs/en/changes/changes.tpl'
+
+ comment: on-failure
+
+dependency:
+ files:
+ - pom.xml
+ - skywalking-ui/package.json
+ excludes:
+ - name: org.openjdk.jmh:jmh-core # We don't distribute the dependencies, they are just for the build process
+ recursive: true
+ - name: org.apache.skywalking:* # Exclude self dependencies
+ - name: org.apache.skywalking:microbench
+ recursive: true
+ licenses:
+ - name: org.slf4j:slf4j-api
+ version: 1.7.30,1.7.32
+ license: MIT
+ - name: com.squareup.okhttp3:okhttp
+ version: 3.14.9,3.12.2
+ license: Apache-2.0
+ - name: com.google.guava:listenablefuture
+ version: 9999.0-empty-to-avoid-conflict-with-guava
+ license: Apache-2.0
+ - name: io.swagger:swagger-annotations
+ version: 1.6.9
+ license: Apache-2.0
+ - name: com.squareup.okio:okio
+ version: 1.15.0,1.17.2
+ license: Apache-2.0
+ - name: com.squareup.retrofit2:retrofit
+ version: 2.3.0,2.5.0
+ license: Apache-2.0
+ - name: com.squareup.retrofit2:converter-jackson
+ version: 2.3.0,2.5.0
+ license: Apache-2.0
+ - name: com.fasterxml.jackson.module:jackson-module-kotlin
+ version: 2.13.4
+ license: Apache-2.0
+ - name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
+ version: 2.18.2
+ license: Apache-2.0
+ - name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8
+ version: 2.18.2
+ license: Apache-2.0
+ - name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml
+ version: 2.15.2
+ license: Apache-2.0
+ - name: com.graphql-java:graphql-java-extended-scalars
+ version: 18.1
+ license: MIT
+ - name: com.graphql-java:graphql-java
+ version: 21.0
+ license: MIT
+ - name: com.github.luben:zstd-jni
+ version: 1.4.3-1
+ license: BSD-2-Clause
+ - name: org.antlr:antlr4-runtime
+ version: 4.11.1
+ license: BSD-3-Clause
+ - name: com.google.flatbuffers:flatbuffers-java
+ version: 1.12.0
+ license: Apache-2.0
+ - name: build.buf.protoc-gen-validate:pgv-java-stub
+ version: 0.6.13
+ license: Apache-2.0
+ - name: build.buf.protoc-gen-validate:protoc-gen-validate
+ version: 0.6.13
+ license: Apache-2.0
+ - name: com.aayushatharva.brotli4j:service
+ version: 1.18.0
+ license: Apache-2.0
+ - name: io.vertx:vertx-grpc
+ version: 4.5.9
+ license: EPL-2.0
+
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 000000000000..8c79a83ae43f
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# 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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 540b9e8f06d0..000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-sudo: required
-
-services:
- - docker
-
-language: java
-install:
- - jdk_switcher use oraclejdk8
- - mvn clean install --quiet jacoco:report coveralls:report
-
-after_success:
- - bash ./travis/push_image.sh
diff --git a/ApacheCopyright b/ApacheCopyright
deleted file mode 100644
index 92484e7b63d4..000000000000
--- a/ApacheCopyright
+++ /dev/null
@@ -1,15 +0,0 @@
-Copyright 2017, OpenSkywalking Organization All rights reserved.
-
-Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 2549961e806f..000000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at wu.sheng@foxmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000000..64a72d582a3f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,43 @@
+# Contributing to Apache SkyWalking
+
+Firstly, thanks for your interest in contributing! I hope that this will be a
+pleasant first experience for you, and that you will return to continue
+contributing.
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the Apache
+software Foundation's
+[Code of Conduct](http://www.apache.org/foundation/policies/conduct.html). By
+participating, you are expected to adhere to this code. If you are aware of
+unacceptable behavior, please visit the
+[Reporting Guidelines page](http://www.apache.org/foundation/policies/conduct.html#reporting-guidelines)
+and follow the instructions there.
+
+## How to contribute?
+
+Most of the contributions that we receive are code contributions, but you can
+also contribute to the documentation or simply report solid bugs
+for us to fix.
+
+## How to report a bug?
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/apache/skywalking/issues).
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/apache/skywalking/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
+
+
+## How to add a new feature or change an existing one
+
+_Before making any significant changes, please [open an issue](https://github.com/apache/skywalking/issues)._ Discussing your proposed changes ahead of time will make the contribution process smooth for everyone.
+
+Once we've discussed your changes and you've got your code ready, make sure that tests are passing and open your pull request. Your PR is most likely to be accepted if it:
+
+* Update the README.md with details of changes to the interface.
+* Includes tests for new functionality.
+* References the original issue in description, e.g. "Resolves #123".
+* Has a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+## Do you have questions about the source code?
+
+* Join `#skywalking` channel at [Apache Slack](https://join.slack.com/t/the-asf/shared_invite/enQtNDQ3OTEwNzE1MDg5LWY2NjkwMTEzMGI2ZTI1NzUzMDk0MzJmMWM1NWVmODg0MzBjNjAxYzUwMjIwNDI3MjlhZWRjNmNhOTM5NmIxNDk)
diff --git a/HEADER b/HEADER
new file mode 100644
index 000000000000..1745cfe66833
--- /dev/null
+++ b/HEADER
@@ -0,0 +1,14 @@
+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.
diff --git a/LICENSE b/LICENSE
index 8dada3edaf50..b512f05e1e26 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,3 +199,35 @@
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.
+
+=======================================================================
+Apache SkyWalking Subcomponents:
+
+The Apache SkyWalking project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+========================================================================
+Apache 2.0 licenses
+========================================================================
+
+The following components are provided under the Apache License. See project link for details.
+The text of each license is the standard Apache 2.0 license.
+
+ proto files from cilium: https://github.com/cilium/cilium/tree/v1.15.6/api/v1 Apache 2.0
+ proto files from cncf/udpa: https://github.com/cncf/udpa Apache 2.0
+ proto files from envoyproxy/data-plane-api: https://github.com/envoyproxy/data-plane-api Apache 2.0
+ proto files from prometheus/client_model: https://github.com/prometheus/client_model Apache 2.0
+ proto files from opentelemetry: https://github.com/open-telemetry/opentelemetry-proto/tree/main/opentelemetry/proto Apache 2.0
+ proto files from opentelemetry: https://github.com/open-telemetry/opentelemetry-proto/tree/v0.7.0 Apache 2.0
+ flatbuffers files from istio/proxy: https://github.com/istio/proxy Apache 2.0
+ mvnw files from https://github.com/apache/maven-wrapper Apache 2.0
+ svg files from skywalking-ui/src/assets/icons: https://github.com/google/material-design-icons Apache 2.0
+ ZipkinQueryHandler.java reference from zipkin2.server.internal.ZipkinQueryApiV2: https://github.com/openzipkin/zipkin Apache 2.0
+ Arguments.java in server-library/library-async-profiler-jfr-parser reference from https://github.com/async-profiler/async-profiler/tree/master Apache 2.0
+ CallStack.java in server-library/library-async-profiler-jfr-parser reference from https://github.com/async-profiler/async-profiler/tree/master Apache 2.0
+ Classifier.java in server-library/library-async-profiler-jfr-parser reference from https://github.com/async-profiler/async-profiler/tree/master Apache 2.0
+ Index.java in server-library/library-async-profiler-jfr-parser reference from https://github.com/async-profiler/async-profiler/tree/master Apache 2.0
+ Frame.java in server-library/library-async-profiler-jfr-parser reference from https://github.com/async-profiler/async-profiler/tree/master Apache 2.0
+ JFRConverter.java in server-library/library-async-profiler-jfr-parser reference from https://github.com/async-profiler/async-profiler/tree/master Apache 2.0
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000000..0c0730a1664c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,90 @@
+# 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.
+
+SHELL := /bin/bash -o pipefail
+
+SW_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+CONTEXT ?= ${SW_ROOT}/dist
+SKIP_TEST ?= false
+DIST ?= apache-skywalking-apm-bin.tar.gz
+
+init:
+ cd $(SW_ROOT) && git submodule update --init --recursive
+
+.PHONY: build.all build.backend build.ui
+
+build.all:
+ cd $(SW_ROOT) && ./mvnw --batch-mode clean package -Dmaven.test.skip=$(SKIP_TEST)
+
+build.backend:
+ cd $(SW_ROOT) && ./mvnw --batch-mode clean package -Dmaven.test.skip=$(SKIP_TEST) -Pbackend,dist
+
+build.ui:
+ cd $(SW_ROOT) && ./mvnw --batch-mode clean package -Dmaven.test.skip=$(SKIP_TEST) -Pui,dist
+
+DOCKER_BUILD_TOP:=${CONTEXT}/docker_build
+
+HUB ?= skywalking
+OAP_NAME ?= oap
+UI_NAME ?= ui
+DATA_GENERATOR_NAME ?= data-generator
+TAG ?= latest
+
+.PHONY: docker docker.all
+
+docker: init build.all docker.all
+
+DOCKER_TARGETS:=docker.oap docker.ui
+
+ifneq ($(SW_OAP_BASE_IMAGE),)
+ BUILD_ARGS := $(BUILD_ARGS) --build-arg BASE_IMAGE=$(SW_OAP_BASE_IMAGE)
+endif
+
+BUILD_ARGS := $(BUILD_ARGS) --build-arg DIST=$(DIST)
+
+%.ui: NAME = $(UI_NAME)
+%.oap: NAME = $(OAP_NAME)
+%.data-generator: NAME = $(DATA_GENERATOR_NAME)
+
+docker.%: PLATFORMS =
+docker.%: LOAD_OR_PUSH = --load
+push.%: PLATFORMS = --platform linux/amd64,linux/arm64
+push.%: LOAD_OR_PUSH = --push
+
+docker.% push.docker.%: $(CONTEXT)/$(DIST) $(SW_ROOT)/docker/%/*
+ $(DOCKER_RULE)
+
+docker.all: $(DOCKER_TARGETS)
+docker.push: $(DOCKER_TARGETS:%=push.%)
+
+# $^ the name of the dependencies for the target
+# Rule Steps #
+##############
+# 1. Make a directory $(DOCKER_BUILD_TOP)/$(NAME)
+# 2. This rule uses cp to copy all dependency filenames into into $(DOCKER_BUILD_TOP/$(NAME)
+# 3. This rule finally runs docker build passing $(BUILD_ARGS) to docker if they are specified as a dependency variable
+
+define DOCKER_RULE
+ mkdir -p $(DOCKER_BUILD_TOP)/$(NAME)
+ cp -r $^ $(DOCKER_BUILD_TOP)/$(NAME)
+ docker buildx create --use --driver docker-container --name skywalking_main > /dev/null 2>&1 || true
+ docker buildx build $(PLATFORMS) $(LOAD_OR_PUSH) \
+ --no-cache $(BUILD_ARGS) \
+ -t $(HUB)/$(NAME):$(TAG) \
+ -t $(HUB)/$(NAME):latest \
+ $(DOCKER_BUILD_TOP)/$(NAME)
+ docker buildx rm skywalking_main || true
+endef
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000000000000..7e684bf85de9
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,26 @@
+Apache SkyWalking
+Copyright 2017-2024 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+-----------------------------------------------------------------------
+This product contains code from the Prometheus Project:
+
+Data model artifacts for Prometheus.
+Copyright 2012-2015 The Prometheus Authors
+
+This product includes software developed at
+SoundCloud Ltd. (http://soundcloud.com/).
+-----------------------------------------------------------------------
+This product contains code from the Apache Maven Wrapper Project:
+
+Apache Maven Wrapper
+Copyright 2013-2022 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The original idea and initial implementation of the maven-wrapper module is derived
+from the Gradle Wrapper which was written originally by Hans Dockter and Adam Murdoch.
+Copyright 2007 the original author or authors.
diff --git a/README.md b/README.md
index 4943df3139c6..8967e5b681dc 100644
--- a/README.md
+++ b/README.md
@@ -1,70 +1,71 @@
-Sky Walking | [中文](README_ZH.md)
+Apache SkyWalking
==========
-
+
-**SkyWalking 3**: APM for Distributed Systems, also known Distributed Tracing System.
+**SkyWalking**: an APM (Application Performance Monitoring) system, especially designed for
+microservices, cloud native and container-based architectures.
-[](https://travis-ci.org/OpenSkywalking/skywalking)
-[](https://coveralls.io/github/OpenSkywalking/skywalking?branch=master)
-[](https://gitter.im/openskywalking/Lobby)
-[](http://opentracing.io)
+[](https://github.com/apache/skywalking)
+[](https://x.com/AsfSkyWalking)
-* Provide Java agent, **no need to CHANGE any application source code**.
- * High performance agent. Only increase extra **10%** cpu cost in 5000+ tps application, even **when collect all traces**.
- * [Supported middlewares, frameworks and libraries](docs/Supported-list.md).
-* Manual instrumentation
- * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers)
- * Use **@Trace** annotation for any methods you want to trace.
- * Integrate traceId into logs for log4j, log4j2 and logback.
-* Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs.
-* The UI released on [skywalking-ui](https://github.com/OpenSkywalking/sky-walking-ui)
+
-# Architecture
-* Architecture graph for 3.2.5+
-
+# Abstract
+**SkyWalking** is an open-source APM system that provides monitoring, tracing and diagnosing capabilities for distributed systems in Cloud Native architectures.
-# Document
-[](docs/README.md) [](docs/README_ZH.md)
-This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com.
+* Distributed Tracing
+ * End-to-end distributed tracing. Service topology analysis, service-centric observability and APIs dashboards.
+* Agents for your stack
+ * Java, .Net Core, PHP, NodeJS, Golang, LUA, Rust, C++, Client JavaScript and Python agents with active development and maintenance.
+* eBPF early adoption
+ * Rover agent works as a monitor and profiler powered by eBPF to monitor Kubernetes deployments and diagnose CPU and network performance.
+* Scaling
+ * 100+ billion telemetry data could be collected and analyzed from one SkyWalking cluster.
+* Mature Telemetry Ecosystems Supported
+ * Metrics, Traces, and Logs from mature ecosystems are supported, e.g. Zipkin, OpenTelemetry, Prometheus, Zabbix, Fluentd
+* Native APM Database
+ * BanyanDB, an observability database, created in 2022, aims to ingest, analyze and store telemetry/observability data.
+* Consistent Metrics Aggregation
+ * SkyWalking native meter format and widely known metrics format(OpenTelemetry, Telegraf, Zabbix, e.g.) are processed through the same script pipeline.
+* Log Management Pipeline
+ * Support log formatting, extract metrics, various sampling policies through script pipeline in high performance.
+* Alerting and Telemetry Pipelines
+ * Support service-centric, deployment-centric, API-centric alarm rule setting. Support forwarding alarms and all telemetry data to 3rd party.
+* AI Power Enabled
+ * Machine Learning (ML) and Artificial Intelligence (AI) analyze observability data to identify patterns and enhance capabilities, such as recognizing HTTP URI patterns and automatically calculating metric baselines for intelligent alerting, improving anomaly detection.
-# Screenshots
-- Discovery topological graph of application clusters automatically.
-
+
-- Trace query.
-
+# Live Demo
+- Find the [SkyWalking live demo with native UI and Grafana](https://skywalking.apache.org/#demo), and [screenshots](https://skywalking.apache.org/#arch) on our website.
+- Follow the [showcase](https://skywalking.apache.org/docs/skywalking-showcase/next/readme/) to set up a preview deployment quickly.
-- Span detail.
-
+# Documentation
+- [Official documentation](https://skywalking.apache.org/docs/#SkyWalking)
-- Instance Overview.
-
+# Downloads
+Please head to the [releases page](https://skywalking.apache.org/downloads/) to download a release of Apache SkyWalking.
-- JVM Detail.
-
+# Compiling project
+Follow this [document](docs/en/guides/How-to-build.md).
-- Services Dependency Tree.
-
-
-# Test reports
-- Automatic integration test reports
- - [Java Agent test report](https://github.com/SkywalkingTest/agent-integration-test-report)
-- Performance test reports
- - [Java Agent test report](https://skywalkingtest.github.io/Agent-Benchmarks/)
+# Code of conduct
+This project adheres to the Contributor Covenant [code of conduct](https://www.apache.org/foundation/policies/conduct). By participating, you are expected to uphold this code.
+Please follow the [REPORTING GUIDELINES](https://www.apache.org/foundation/policies/conduct#reporting-guidelines) to report unacceptable behavior.
# Contact Us
-* Submit an issue
-* [Gitter](https://gitter.im/openskywalking/Lobby)
-* [Google Mailing List](https://groups.google.com/forum/#!forum/skywalking-distributed-tracing-and-apm)
-* QQ Group: 392443393
-
-# Open Skywalking Organization
-[Open Skywalking Organization Teams and Contributors](https://github.com/OpenSkywalking/Organization/blob/master/README.md)
-
-# Partners
-
+* Mail list: **dev@skywalking.apache.org**. Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the mail list.
+* Send `Request to join SkyWalking slack` mail to the mail list(`dev@skywalking.apache.org`), we will invite you in.
+* For Chinese speaker, send `[CN] Request to join SkyWalking slack` mail to the mail list(`dev@skywalking.apache.org`), we will invite you in.
+* Twitter, [ASFSkyWalking](https://twitter.com/AsfSkyWalking)
+* [bilibili B站 视频](https://space.bilibili.com/390683219)
+* [掘金](https://juejin.cn/user/13673577331607/posts)
+
+# Our Users
+Hundreds of companies and organizations use SkyWalking for research, production, and commercial purposes.
+Visit our [website](http://skywalking.apache.org/users/) to find the user page.
# License
-[Apache 2.0 License.](/LICENSE)
+[Apache 2.0 License.](LICENSE)
diff --git a/README_ZH.md b/README_ZH.md
deleted file mode 100644
index 3d92f9357076..000000000000
--- a/README_ZH.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Sky Walking | [English](README.md)
-==========
-
-
-
-**SkyWalking 3**: 针对分布式系统的APM系统，也被称为分布式追踪系统
-
-[](https://travis-ci.org/OpenSkywalking/skywalking)
-[](https://coveralls.io/github/OpenSkywalking/skywalking?branch=master)
-[](https://gitter.im/openskywalking/Lobby)
-[](http://opentracing.io)
-
-
-* Java自动探针，**不需要修改应用程序源代码**
- * 高性能探针，针对单实例5000tps的应用，在**全量采集的情况下**，只增加**10%**的CPU开销。
- * [中间件，框架与类库支持列表](docs/Supported-list.md).
-* 手动探针
- * [使用OpenTracing手动探针API](http://opentracing.io/documentation/pages/supported-tracers)
- * 使用 [**@Trace**](docs/cn/Application-toolkit-trace-CN.md) 标注追踪业务方法
- * 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中
-* 纯Java后端Collector实现，提供RESTful和gRPC接口。兼容接受其他语言探针发送数据
- * [如何将探针的Metric和Trace数据上传到Collector？](/docs/cn/How-to-communicate-with-the-collector-CN.md)
-* UI工程请查看 [skywalking-ui](https://github.com/OpenSkywalking/skywalking-ui)
-* 中文QQ群：392443393
-
-# Architecture
-* 3.2.5+版本架构图
-
-
-# Document
-[](docs/README.md) [](docs/README_ZH.md)
-
-This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com.
-
-# Screenshots
-- 分布式系统拓扑图自动发现
-
-
-- 调用链查询
-
-
-- Span信息查询
-
-
-- 实例全局视图
-
-
-- JVM明细信息
-
-
-- 服务依赖树.
-
-
-
-# Test reports
-- 自动化集成测试报告
- - [Java探针测试报告](https://github.com/SkywalkingTest/agent-integration-test-report)
-- 性能测试报告
- - [Java探针测试报告](https://skywalkingtest.github.io/Agent-Benchmarks/)
-
-# Contact Us
-* 直接提交Issue
-* [Gitter](https://gitter.im/openskywalking/Lobby)
-* [Google Mailing List](https://groups.google.com/forum/#!forum/skywalking-distributed-tracing-and-apm)
-* QQ群: 392443393
-
-# Open Skywalking Organization
-[Open Skywalking Organization Teams and Contributors](https://github.com/OpenSkywalking/Organization/blob/master/README.md)
-
-# Partners
-
-
-# License
-[Apache 2.0 License.](/LICENSE)
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
deleted file mode 100644
index 1da25be41776..000000000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
- apm-application-toolkit
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-toolkit-log4j-1.x
-
-
-
- log4j
- log4j
- 1.2.17
- provided
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
-
- attach-sources
- none
-
- jar
-
-
-
- 2.4
-
-
-
-
-
-
- bintray-wu-sheng-sky-walking-repository
- wu-sheng-sky-walking-repository
- https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-log4j-1.x/;publish=1
-
-
-
-
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java
deleted file mode 100644
index 534da7610e66..000000000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternConverter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.log4j.v1.x;
-
-import org.apache.log4j.helpers.PatternConverter;
-import org.apache.log4j.spi.LoggingEvent;
-
-/**
- * Default implementation outputs "TID: N/A".
- * But, if in sky-walking agent active mode, output will become the real ids.
- *
- * Created by wusheng on 2016/12/7.
- */
-
-public class TraceIdPatternConverter extends PatternConverter {
- @Override
- protected String convert(LoggingEvent loggingEvent) {
- return "TID: N/A";
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java
deleted file mode 100644
index 8de3416d6749..000000000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.log4j.v1.x;
-
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.helpers.PatternParser;
-
-/**
- * The log4j extend pattern. By using this pattern, if sky-walking agent is also active, {@link
- * PatternParser#finalizeConverter(char)} method will be override dynamic.
- *
- * @author wusheng
- */
-public class TraceIdPatternLayout extends PatternLayout {
- @Override
- protected PatternParser createPatternParser(String pattern) {
- return new TraceIdPatternParser(pattern);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java b/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java
deleted file mode 100644
index d6d9bd815daa..000000000000
--- a/apm-application-toolkit/apm-toolkit-log4j-1.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v1/x/TraceIdPatternParser.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.log4j.v1.x;
-
-import org.apache.log4j.helpers.PatternParser;
-
-/**
- * Base on '%T', use {@link TraceIdPatternConverter} to convert the '%t' to traceId.
- *
- * Created by wusheng on 2016/12/7.
- */
-public class TraceIdPatternParser extends PatternParser {
- public TraceIdPatternParser(String pattern) {
- super(pattern);
- }
-
- @Override
- protected void finalizeConverter(char c) {
- if ('T' == c) {
- addConverter(new TraceIdPatternConverter());
- } else {
- super.finalizeConverter(c);
- }
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
deleted file mode 100644
index 86e16fa3be2c..000000000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
- apm-application-toolkit
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-toolkit-log4j-2.x
-
-
-
- org.apache.logging.log4j
- log4j-core
- 2.7
- provided
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
-
- attach-sources
- none
-
- jar
-
-
-
- 2.4
-
-
-
-
-
-
- bintray-wu-sheng-sky-walking-repository
- wu-sheng-sky-walking-repository
- https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-log4j-2.x/;publish=1
-
-
-
-
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java
deleted file mode 100644
index 153209686137..000000000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v2/x/Log4j2OutputAppender.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.log4j.v2.x;
-
-/**
- * Created by wusheng on 2016/12/11.
- */
-public class Log4j2OutputAppender {
- /**
- * As default, append "TID: N/A" to the output message,
- * if sky-walking agent in active mode, append the real traceId in the recent Context, if existed, or empty String.
- *
- * @param toAppendTo origin output message.
- */
- public static void append(StringBuilder toAppendTo) {
- toAppendTo.append("TID: N/A");
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java b/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java
deleted file mode 100644
index 8335802f5cab..000000000000
--- a/apm-application-toolkit/apm-toolkit-log4j-2.x/src/main/java/org/skywalking/apm/toolkit/log/log4j/v2/x/TraceIdConverter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.log4j.v2.x;
-
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.pattern.ConverterKeys;
-import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
-
-/**
- * {@link TraceIdConverter} is a log4j2 plugin, by annotation as {@link Plugin}.
- * It convert the pattern key: traceId.
- * Use '%traceId' in log4j2's config: ,
- * '%traceId' will output as TID:xxxx
- *
- * Created by wusheng on 2016/12/7.
- */
-@Plugin(name = "TraceIdConverter", category = "Converter")
-@ConverterKeys({"traceId"})
-public class TraceIdConverter extends LogEventPatternConverter {
-
- /**
- * Constructs an instance of LoggingEventPatternConverter.
- *
- * @param name name of converter.
- * @param style CSS style for output.
- */
- protected TraceIdConverter(String name, String style) {
- super(name, style);
- }
-
- public static TraceIdConverter newInstance(String[] options) {
- return new TraceIdConverter("traceId", "traceId");
- }
-
- @Override
- public void format(LogEvent event, StringBuilder toAppendTo) {
- Log4j2OutputAppender.append(toAppendTo);
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
deleted file mode 100644
index 94da54eb3a94..000000000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
- apm-application-toolkit
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-toolkit-logback-1.x
-
-
-
- ch.qos.logback
- logback-classic
- 1.1.7
- provided
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
-
- attach-sources
- none
-
- jar
-
-
-
- 2.4
-
-
-
-
-
-
- bintray-wu-sheng-sky-walking-repository
- wu-sheng-sky-walking-repository
- https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-logback-1.x/;publish=1
-
-
-
-
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java
deleted file mode 100644
index eaadcb35ebe9..000000000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/LogbackPatternConverter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.logback.v1.x;
-
-import ch.qos.logback.classic.pattern.ClassicConverter;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-
-/**
- * Created by wusheng on 2016/12/7.
- */
-public class LogbackPatternConverter extends ClassicConverter {
- /**
- * As default, return "TID: N/A" to the output message,
- * if sky-walking agent in active mode, return the real traceId in the recent Context, if existed.
- *
- * @param iLoggingEvent
- * @return the traceId: N/A, empty String, or the real traceId.
- */
- @Override
- public String convert(ILoggingEvent iLoggingEvent) {
- return "TID: N/A";
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java
deleted file mode 100644
index e2404974305a..000000000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/TraceIdPatternLogbackLayout.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.logback.v1.x;
-
-import ch.qos.logback.classic.PatternLayout;
-
-/**
- * Based on the logback-compoenent convert register mechanism,
- * register {@link LogbackPatternConverter} as a new convert, match to "tid".
- * You can use "%tid" in logback config file, "Pattern" section.
- *
- * Created by wusheng on 2016/12/7.
- */
-public class TraceIdPatternLogbackLayout extends PatternLayout {
- static {
- defaultConverterMap.put("tid", LogbackPatternConverter.class.getName());
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java
deleted file mode 100644
index e1c8d7b0828b..000000000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/mdc/LogbackMDCPatternConverter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.logback.v1.x.mdc;
-
-import ch.qos.logback.classic.pattern.MDCConverter;
-import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.util.OptionHelper;
-
-/**
- * @author zhangkewei
- */
-public class LogbackMDCPatternConverter extends MDCConverter {
- private static final String CONVERT_KEY = "tid";
-
- private boolean convert4TID = false;
- @Override
- public void start() {
- super.start();
- String[] key = OptionHelper.extractDefaultReplacement(getFirstOption());
- if (null != key && key.length > 0 && CONVERT_KEY.equals(key[0])) {
- convert4TID = true;
- }
- }
- @Override
- public String convert(ILoggingEvent iLoggingEvent) {
- return convert4TID ? convertTID() : super.convert(iLoggingEvent);
- }
-
- public String convertTID() {
- return "TID: N/A";
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java b/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
deleted file mode 100644
index d67142578d12..000000000000
--- a/apm-application-toolkit/apm-toolkit-logback-1.x/src/main/java/org/skywalking/apm/toolkit/log/logback/v1/x/mdc/TraceIdMDCPatternLogbackLayout.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.log.logback.v1.x.mdc;
-
-import ch.qos.logback.classic.PatternLayout;
-
-/**
- * Override "X",SuperClass run before Subclass.
- * @author zhangkewei
- */
-public class TraceIdMDCPatternLogbackLayout extends PatternLayout {
- static {
- defaultConverterMap.put("X", LogbackMDCPatternConverter.class.getName());
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml
deleted file mode 100644
index 3d69a33cdd61..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
- apm-application-toolkit
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-toolkit-opentracing
-
-
-
- io.opentracing
- opentracing-api
- 0.30.0
-
-
- io.opentracing
- opentracing-noop
- 0.30.0
-
-
-
-
-
- bintray-wu-sheng-sky-walking-repository
- wu-sheng-sky-walking-repository
- https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-opentracing/;publish=1
-
-
-
-
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/ByteBufferContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/ByteBufferContext.java
deleted file mode 100644
index c0b532680461..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/ByteBufferContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.SpanContext;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by wusheng on 2016/12/21.
- */
-public class ByteBufferContext implements SpanContext {
- static final Charset CHARSET = Charset.forName("UTF-8");
-
- static final byte NO_ENTRY = 0;
- static final byte ENTRY = 1;
-
- private final ByteBuffer byteBuffer;
-
- ByteBufferContext(ByteBuffer byteBuffer) {
- this.byteBuffer = byteBuffer;
- }
-
- @Override
- public Iterable> baggageItems() {
- return new HashMap().entrySet();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java
deleted file mode 100644
index d51f45bc579b..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/NeedSnifferActivation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The NeedSnifferActivation annotation is flag for reader and maintainers,
- * which represents this method should be activated/intercepted in sniffer.
- *
- * @author wusheng
- */
-@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
-@Retention(RetentionPolicy.SOURCE)
-public @interface NeedSnifferActivation {
- String value() default "What should interceptor do?";
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java
deleted file mode 100644
index 88ab95f7d73e..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingActiveSpan.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.ActiveSpan;
-import io.opentracing.SpanContext;
-import java.util.Map;
-
-/**
- * The SkywalkingActiveSpan is an extension of {@link SkywalkingSpan},
- * but because of Java inheritance restrict, only can do with a facade mode.
- *
- * @author wusheng
- */
-public class SkywalkingActiveSpan implements ActiveSpan {
- private SkywalkingSpan span;
-
- public SkywalkingActiveSpan(SkywalkingSpan span) {
- this.span = span;
- }
-
- @Override
- public void deactivate() {
- span.finish();
- }
-
- @Override
- public void close() {
- this.deactivate();
- }
-
- @Override
- public Continuation capture() {
- return new SkywalkingContinuation();
- }
-
- @Override
- public SpanContext context() {
- return span.context();
- }
-
- @Override
- public ActiveSpan setTag(String key, String value) {
- span.setTag(key, value);
- return this;
- }
-
- @Override
- public ActiveSpan setTag(String key, boolean value) {
- span.setTag(key, value);
- return this;
- }
-
- @Override
- public ActiveSpan setTag(String key, Number value) {
- span.setTag(key, value);
- return this;
- }
-
- @Override
- public ActiveSpan log(Map fields) {
- span.log(fields);
- return this;
- }
-
- @Override
- public ActiveSpan log(long timestampMicroseconds, Map fields) {
- span.log(timestampMicroseconds, fields);
- return this;
- }
-
- @Override
- public ActiveSpan log(String event) {
- span.log(event);
- return this;
- }
-
- @Override
- public ActiveSpan log(long timestampMicroseconds, String event) {
- span.log(timestampMicroseconds, event);
- return this;
- }
-
- /**
- * Don't support baggage item.
- */
- @Override
- public ActiveSpan setBaggageItem(String key, String value) {
- return this;
- }
-
- /**
- * Don't support baggage item.
- *
- * @return null, always.
- */
- @Override
- public String getBaggageItem(String key) {
- return null;
- }
-
- @Override
- public ActiveSpan setOperationName(String operationName) {
- span.setOperationName(operationName);
- return this;
- }
-
- /**
- * Don't support logging with payload.
- */
- @Deprecated
- @Override
- public ActiveSpan log(String eventName, Object payload) {
- return this;
- }
-
- /**
- * Don't support logging with payload.
- */
- @Deprecated
- @Override
- public ActiveSpan log(long timestampMicroseconds, String eventName, Object payload) {
- return this;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingContext.java
deleted file mode 100644
index b33f6ac7cb44..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingContext.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.SpanContext;
-import java.util.Map;
-
-/**
- * Skywalking tracer context based on {@link ThreadLocal} auto mechanism.
- *
- * @author wusheng
- */
-public class SkywalkingContext implements SpanContext {
- public static final SkywalkingContext INSTANCE = new SkywalkingContext();
-
- private SkywalkingContext() {
- }
-
- @Override
- public Iterable> baggageItems() {
- return null;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java
deleted file mode 100644
index 41ef9de16364..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingContinuation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.ActiveSpan;
-
-/**
- * @author wusheng
- */
-public class SkywalkingContinuation implements ActiveSpan.Continuation {
- @NeedSnifferActivation("1. ContextManager#capture" +
- "2. set ContextSnapshot to the dynamic field")
- public SkywalkingContinuation() {
- }
-
- @NeedSnifferActivation("1. get ContextSnapshot from the dynamic field" +
- "2. ContextManager#continued")
- @Override
- public ActiveSpan activate() {
- SkywalkingSpanBuilder builder = new SkywalkingSpanBuilder("Thread/" + Thread.currentThread().getName());
- return builder.startActive();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java
deleted file mode 100644
index 1e08903fb2c2..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingSpan.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.Span;
-import io.opentracing.SpanContext;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author wusheng
- */
-public class SkywalkingSpan implements Span {
- @NeedSnifferActivation(
- "1.ContextManager#createSpan (Entry,Exit,Local based on builder)." +
- "2.set the span reference to the dynamic field of enhanced SkywalkingSpan") SkywalkingSpan(
- SkywalkingSpanBuilder builder) {
- }
-
- /**
- * Create a shell span for {@link SkywalkingTracer#activeSpan()}
- *
- * @param tracer
- */
- @NeedSnifferActivation(
- "1. set the span reference to the dynamic field of enhanced SkywalkingSpan")
- public SkywalkingSpan(SkywalkingTracer tracer) {
-
- }
-
- @NeedSnifferActivation("Override span's operationName, which has been given at ")
- @Override
- public Span setOperationName(String operationName) {
- return this;
- }
-
- @NeedSnifferActivation("AbstractTracingSpan#log(long timestampMicroseconds, Map fields)")
- @Override
- public Span log(long timestampMicroseconds, Map fields) {
- return this;
- }
-
- /**
- * Stop the active span
- *
- * @param finishMicros
- */
- @NeedSnifferActivation(
- "1.ContextManager#stopSpan(AbstractSpan span)" +
- "2. The parameter of stop methed is from the dynamic field of enhanced SkywalkingSpan")
- @Override
- public void finish(long finishMicros) {
-
- }
-
- @Override
- public Span log(long timestampMicroseconds, String event) {
- Map eventMap = new HashMap(1);
- eventMap.put("event", event);
- return log(timestampMicroseconds, eventMap);
- }
-
- @Override
- public void finish() {
- this.finish(System.currentTimeMillis());
- }
-
- @Override
- public SpanContext context() {
- return SkywalkingContext.INSTANCE;
- }
-
- @NeedSnifferActivation(
- "1. ContextManager#activeSpan()" +
- "2. SkywalkingSpan#setTag(String, String)")
- @Override public Span setTag(String key, String value) {
- return this;
- }
-
- @Override public Span setTag(String key, boolean value) {
- return setTag(key, String.valueOf(value));
- }
-
- @Override public Span setTag(String key, Number value) {
- return setTag(key, String.valueOf(value));
- }
-
- @Override
- public Span log(Map fields) {
- return log(System.currentTimeMillis(), fields);
- }
-
- @Override
- public Span log(String event) {
- return log(System.currentTimeMillis(), event);
- }
-
- /**
- * Don't support baggage item.
- */
- @Override
- public Span setBaggageItem(String key, String value) {
- return this;
- }
-
- /**
- * Don't support baggage item.
- *
- * @return null, always.
- */
- @Override
- public String getBaggageItem(String key) {
- return null;
- }
-
- /**
- * Don't support logging with payload.
- */
- @Deprecated
- @Override
- public Span log(String eventName, Object payload) {
- return this;
- }
-
- /**
- * Don't support logging with payload.
- */
- @Deprecated
- @Override
- public Span log(long timestampMicroseconds, String eventName, Object payload) {
- return this;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java
deleted file mode 100644
index 6291ffced579..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.ActiveSpan;
-import io.opentracing.BaseSpan;
-import io.opentracing.References;
-import io.opentracing.Span;
-import io.opentracing.SpanContext;
-import io.opentracing.Tracer;
-import io.opentracing.tag.Tags;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author wusheng
- */
-public class SkywalkingSpanBuilder implements Tracer.SpanBuilder {
- private List tags = new LinkedList();
- private String operationName;
- private boolean isEntry = false;
- private boolean isExit = false;
- private int port;
- private String peer;
- private String componentName;
- private boolean isError = false;
- private long startTime;
-
- public SkywalkingSpanBuilder(String operationName) {
- this.operationName = operationName;
- }
-
- @Override
- public Tracer.SpanBuilder asChildOf(SpanContext parent) {
- if (parent instanceof SkywalkingContext) {
- return this;
- }
- throw new IllegalArgumentException("parent must be type of SpanContext");
- }
-
- @Override
- public Tracer.SpanBuilder asChildOf(BaseSpan parent) {
- if (parent instanceof SkywalkingSpan || parent instanceof SkywalkingActiveSpan) {
- return this;
- }
- throw new IllegalArgumentException("parent must be type of SkywalkingSpan");
- }
-
- /**
- * Ignore the reference type. the span always the entry or has a parent span.
- *
- * @param referenceType
- * @param referencedContext
- * @return
- */
- @Override
- public Tracer.SpanBuilder addReference(String referenceType, SpanContext referencedContext) {
- if (References.FOLLOWS_FROM.equals(referenceType)) {
- throw new IllegalArgumentException("only support CHILD_OF reference");
- }
- return asChildOf(referencedContext);
- }
-
- @Override
- public Tracer.SpanBuilder withTag(String key, String value) {
- if (Tags.COMPONENT.getKey().equals(key)) {
- componentName = value;
- } else if (Tags.SPAN_KIND.getKey().equals(key)) {
- if (Tags.SPAN_KIND_CLIENT.equals(value) || Tags.SPAN_KIND_PRODUCER.equals(value)) {
- isEntry = false;
- isExit = true;
- } else if (Tags.SPAN_KIND_SERVER.equals(value) || Tags.SPAN_KIND_CONSUMER.equals(value)) {
- isEntry = true;
- isExit = false;
- } else {
- isEntry = false;
- isExit = false;
- }
- } else if (Tags.PEER_HOST_IPV4.getKey().equals(key) || Tags.PEER_HOST_IPV6.getKey().equals(key)
- || Tags.PEER_HOSTNAME.getKey().equals(key)) {
- peer = value;
- } else if (Tags.PEER_SERVICE.getKey().equals(key)) {
- operationName = value;
- } else {
- tags.add(new Tag(key, value));
- }
- return this;
- }
-
- @Override
- public Tracer.SpanBuilder withTag(String key, boolean value) {
- if (Tags.ERROR.equals(key)) {
- isError = value;
- } else {
- tags.add(new Tag(key, value ? "true" : "false"));
- }
- return this;
- }
-
- @Override
- public Tracer.SpanBuilder withTag(String key, Number value) {
- if (Tags.PEER_PORT.getKey().equals(key)) {
- port = value.intValue();
- } else {
- tags.add(new Tag(key, value.toString()));
- }
- return this;
- }
-
- @Override
- public Tracer.SpanBuilder withStartTimestamp(long microseconds) {
- startTime = microseconds;
- return this;
- }
-
- @Override
- public ActiveSpan startActive() {
- return new SkywalkingActiveSpan(new SkywalkingSpan(this));
- }
-
- @Override
- public Span startManual() {
- return new SkywalkingSpan(this);
- }
-
- @Override
- @Deprecated
- public Span start() {
- return startManual();
- }
-
- /**
- * All the get methods are for accessing data from activation
- */
- public List getTags() {
- return tags;
- }
-
- public String getOperationName() {
- return operationName;
- }
-
- public boolean isEntry() {
- return isEntry;
- }
-
- public boolean isExit() {
- return isExit;
- }
-
- public int getPort() {
- return port;
- }
-
- public String getPeer() {
- return peer;
- }
-
- public String getComponentName() {
- return componentName;
- }
-
- public boolean isError() {
- return isError;
- }
-
- public long getStartTime() {
- return startTime;
- }
-
- /**
- * All the following methods are needed for activation.
- */
- @Override
- @NeedSnifferActivation("Stop the active span.")
- public Tracer.SpanBuilder ignoreActiveSpan() {
- return this;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java
deleted file mode 100644
index 16b03a537644..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.ActiveSpan;
-import io.opentracing.Span;
-import io.opentracing.SpanContext;
-import io.opentracing.Tracer;
-import io.opentracing.propagation.Format;
-
-/**
- * @author wusheng
- */
-public class SkywalkingTracer implements Tracer {
-
- public SpanBuilder buildSpan(String operationName) {
- return new SkywalkingSpanBuilder(operationName);
- }
-
- @NeedSnifferActivation
- @Override
- public void inject(SpanContext spanContext, Format format, C carrier) {
-
- }
-
- @NeedSnifferActivation
- @Override
- public SpanContext extract(Format format, C carrier) {
- return new TextMapContext();
- }
-
- @Override
- public ActiveSpan activeSpan() {
- return new SkywalkingActiveSpan(new SkywalkingSpan(this));
- }
-
- @Override
- public ActiveSpan makeActive(Span span) {
- if (span instanceof SkywalkingSpan) {
- return new SkywalkingActiveSpan((SkywalkingSpan)span);
- } else {
- throw new IllegalArgumentException("span must be a type of SkywalkingSpan");
- }
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/Tag.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/Tag.java
deleted file mode 100644
index e43ddec2dde4..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/Tag.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-/**
- * @author wusheng
- */
-public class Tag {
- private String key;
- private String value;
-
- public Tag(String key, String value) {
- this.key = key;
- this.value = value;
- }
-
- public String getKey() {
- return key;
- }
-
- public String getValue() {
- return value;
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/TextMapContext.java b/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/TextMapContext.java
deleted file mode 100644
index 9bc98f862cba..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/skywalking/apm/toolkit/opentracing/TextMapContext.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.opentracing;
-
-import io.opentracing.SpanContext;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by wusheng on 2016/12/21.
- */
-public class TextMapContext implements SpanContext {
- public TextMapContext() {
- }
-
- @Override
- public Iterable> baggageItems() {
- return new HashMap(0).entrySet();
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer b/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer
deleted file mode 100644
index 980fb4a6c329..000000000000
--- a/apm-application-toolkit/apm-toolkit-opentracing/src/main/resources/META-INF.services/io.opentracing.Tracer
+++ /dev/null
@@ -1 +0,0 @@
-org.skywalking.apm.toolkit.opentracing.SkyWalkingTracer
diff --git a/apm-application-toolkit/apm-toolkit-trace/pom.xml b/apm-application-toolkit/apm-toolkit-trace/pom.xml
deleted file mode 100644
index 024864a3e90d..000000000000
--- a/apm-application-toolkit/apm-toolkit-trace/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
- apm-application-toolkit
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-toolkit-trace
- jar
-
- http://maven.apache.org
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
-
- attach-sources
- none
-
- jar
-
-
-
- 2.4
-
-
-
-
-
-
- bintray-wu-sheng-sky-walking-repository
- wu-sheng-sky-walking-repository
-
- https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-trace/;publish=1
-
-
-
-
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/ActiveSpan.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/ActiveSpan.java
deleted file mode 100644
index 17b7a35de36c..000000000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/ActiveSpan.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.trace;
-
-/**
- * provide custom api that set tag for current active span.
- *
- * @author zhangxin
- */
-public class ActiveSpan {
- /**
- * @param key tag key
- * @param value tag value
- */
- public static void tag(String key, String value) {
-
- }
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/Trace.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/Trace.java
deleted file mode 100644
index 042d840f5eb2..000000000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/Trace.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.trace;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The agent create local span if the method that annotation with {@link Trace}. The value of span operation name will
- * fetch by {@link #operationName()}. if the value of {@link #operationName()} is blank string. the operation name will
- * be set the class name + method name.
- *
- * @author zhangxin
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Trace {
- /**
- * @return operation name, the default value is blank string.
- */
- String operationName() default "";
-}
diff --git a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java
deleted file mode 100644
index edfa0d00360c..000000000000
--- a/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.toolkit.trace;
-
-/**
- * Try to access the sky-walking tracer context.
- * The context is not existed, always.
- * only the middleware, component, or rpc-framework are supported in the current invoke stack, in the same thread,
- * the context will be available.
- *
- * Created by xin on 2016/12/15.
- */
-public class TraceContext {
-
- /**
- * Try to get the traceId of current trace context.
- *
- * @return traceId, if it exists, or empty {@link String}.
- */
- public static String traceId() {
- return "";
- }
-}
diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml
deleted file mode 100644
index b545efacb9b5..000000000000
--- a/apm-application-toolkit/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
- apm
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
- apm-application-toolkit
- pom
-
-
- 1.6
-
-
-
- apm-toolkit-log4j-1.x
- apm-toolkit-log4j-2.x
- apm-toolkit-logback-1.x
- apm-toolkit-opentracing
- apm-toolkit-trace
-
-
diff --git a/apm-checkstyle/checkStyle.xml b/apm-checkstyle/checkStyle.xml
new file mode 100755
index 000000000000..096680e7b602
--- /dev/null
+++ b/apm-checkstyle/checkStyle.xml
@@ -0,0 +1,118 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml
deleted file mode 100644
index b5504230cae3..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
- apm-collector-agent-grpc
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-agent-grpc-define
- jar
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java
deleted file mode 100644
index 7e574016a968..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc;
-
-import org.skywalking.apm.collector.core.module.Module;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentGRPCModule extends Module {
-
- public static final String NAME = "agent_gRPC";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class[] services() {
- return new Class[0];
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
deleted file mode 100644
index d6fe0707c4f0..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.agent.grpc.AgentGRPCModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml
deleted file mode 100644
index da92a7319e7f..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
- apm-collector-agent-grpc
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-agent-grpc-provider
- jar
-
-
-
- org.skywalking
- collector-agent-grpc-define
- ${project.version}
-
-
- org.skywalking
- collector-grpc-manager-define
- ${project.version}
-
-
- org.skywalking
- collector-cluster-define
- ${project.version}
-
-
- org.skywalking
- collector-naming-define
- ${project.version}
-
-
- org.skywalking
- collector-agent-stream-define
- ${project.version}
-
-
-
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java
deleted file mode 100644
index d45d382285ad..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc;
-
-import java.util.Properties;
-import org.skywalking.apm.collector.agent.grpc.handler.ApplicationRegisterServiceHandler;
-import org.skywalking.apm.collector.agent.grpc.handler.InstanceDiscoveryServiceHandler;
-import org.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler;
-import org.skywalking.apm.collector.agent.grpc.handler.ServiceNameDiscoveryServiceHandler;
-import org.skywalking.apm.collector.agent.grpc.handler.TraceSegmentServiceHandler;
-import org.skywalking.apm.collector.agent.grpc.handler.naming.AgentGRPCNamingHandler;
-import org.skywalking.apm.collector.agent.grpc.handler.naming.AgentGRPCNamingListener;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.cluster.ClusterModule;
-import org.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.ModuleProvider;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.skywalking.apm.collector.grpc.manager.GRPCManagerModule;
-import org.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;
-import org.skywalking.apm.collector.naming.NamingModule;
-import org.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
-import org.skywalking.apm.collector.server.Server;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentModuleGRPCProvider extends ModuleProvider {
-
- public static final String NAME = "gRPC";
- private static final String HOST = "host";
- private static final String PORT = "port";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class module() {
- return AgentGRPCModule.class;
- }
-
- @Override public void prepare(Properties config) throws ServiceNotProvidedException {
-
- }
-
- @Override public void start(Properties config) throws ServiceNotProvidedException {
- String host = config.getProperty(HOST);
- Integer port = (Integer)config.get(PORT);
-
- ModuleRegisterService moduleRegisterService = getManager().find(ClusterModule.NAME).getService(ModuleRegisterService.class);
- moduleRegisterService.register(AgentGRPCModule.NAME, this.name(), new AgentModuleGRPCRegistration(host, port));
-
- AgentGRPCNamingListener namingListener = new AgentGRPCNamingListener();
- ModuleListenerService moduleListenerService = getManager().find(ClusterModule.NAME).getService(ModuleListenerService.class);
- moduleListenerService.addListener(namingListener);
-
- NamingHandlerRegisterService namingHandlerRegisterService = getManager().find(NamingModule.NAME).getService(NamingHandlerRegisterService.class);
- namingHandlerRegisterService.register(new AgentGRPCNamingHandler(namingListener));
-
- GRPCManagerService managerService = getManager().find(GRPCManagerModule.NAME).getService(GRPCManagerService.class);
- Server gRPCServer = managerService.createIfAbsent(host, port);
-
- addHandlers(gRPCServer);
- }
-
- @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
-
- }
-
- @Override public String[] requiredModules() {
- return new String[] {ClusterModule.NAME, NamingModule.NAME, GRPCManagerModule.NAME, AgentStreamModule.NAME};
- }
-
- private void addHandlers(Server gRPCServer) {
- gRPCServer.addHandler(new ApplicationRegisterServiceHandler(getManager()));
- gRPCServer.addHandler(new InstanceDiscoveryServiceHandler(getManager()));
- gRPCServer.addHandler(new ServiceNameDiscoveryServiceHandler(getManager()));
- gRPCServer.addHandler(new JVMMetricsServiceHandler(getManager()));
- gRPCServer.addHandler(new TraceSegmentServiceHandler(getManager()));
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java
deleted file mode 100644
index b6cd573d870a..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCRegistration.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc;
-
-import org.skywalking.apm.collector.cluster.ModuleRegistration;
-import org.skywalking.apm.collector.core.util.Const;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentModuleGRPCRegistration extends ModuleRegistration {
-
- private final String host;
- private final int port;
-
- public AgentModuleGRPCRegistration(String host, int port) {
- this.host = host;
- this.port = port;
- }
-
- @Override public Value buildValue() {
- return new Value(host, port, Const.EMPTY_STRING);
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java
deleted file mode 100644
index d3dcbff20c31..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc.handler;
-
-import com.google.protobuf.ProtocolStringList;
-import io.grpc.stub.StreamObserver;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.register.IApplicationIDService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.server.grpc.GRPCHandler;
-import org.skywalking.apm.network.proto.Application;
-import org.skywalking.apm.network.proto.ApplicationMapping;
-import org.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc;
-import org.skywalking.apm.network.proto.KeyWithIntegerValue;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationRegisterServiceHandler extends ApplicationRegisterServiceGrpc.ApplicationRegisterServiceImplBase implements GRPCHandler {
-
- private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterServiceHandler.class);
-
- private final IApplicationIDService applicationIDService;
-
- public ApplicationRegisterServiceHandler(ModuleManager moduleManager) {
- applicationIDService = moduleManager.find(AgentStreamModule.NAME).getService(IApplicationIDService.class);
- }
-
- @Override public void register(Application request, StreamObserver responseObserver) {
- logger.debug("register application");
- ProtocolStringList applicationCodes = request.getApplicationCodeList();
-
- ApplicationMapping.Builder builder = ApplicationMapping.newBuilder();
- for (int i = 0; i < applicationCodes.size(); i++) {
- String applicationCode = applicationCodes.get(i);
- int applicationId = applicationIDService.getOrCreate(applicationCode);
-
- if (applicationId != 0) {
- KeyWithIntegerValue value = KeyWithIntegerValue.newBuilder().setKey(applicationCode).setValue(applicationId).build();
- builder.addApplication(value);
- }
- }
- responseObserver.onNext(builder.build());
- responseObserver.onCompleted();
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java
deleted file mode 100644
index 0f5197a3ce26..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/InstanceDiscoveryServiceHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc.handler;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import io.grpc.stub.StreamObserver;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.register.IInstanceIDService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.server.grpc.GRPCHandler;
-import org.skywalking.apm.network.proto.ApplicationInstance;
-import org.skywalking.apm.network.proto.ApplicationInstanceMapping;
-import org.skywalking.apm.network.proto.ApplicationInstanceRecover;
-import org.skywalking.apm.network.proto.Downstream;
-import org.skywalking.apm.network.proto.InstanceDiscoveryServiceGrpc;
-import org.skywalking.apm.network.proto.OSInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class InstanceDiscoveryServiceHandler extends InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceImplBase implements GRPCHandler {
-
- private final Logger logger = LoggerFactory.getLogger(InstanceDiscoveryServiceHandler.class);
-
- private final IInstanceIDService instanceIDService;
-
- public InstanceDiscoveryServiceHandler(ModuleManager moduleManager) {
- this.instanceIDService = moduleManager.find(AgentStreamModule.NAME).getService(IInstanceIDService.class);
- }
-
- @Override
- public void register(ApplicationInstance request, StreamObserver responseObserver) {
- long timeBucket = TimeBucketUtils.INSTANCE.getSecondTimeBucket(request.getRegisterTime());
- int instanceId = instanceIDService.getOrCreate(request.getApplicationId(), request.getAgentUUID(), timeBucket, buildOsInfo(request.getOsinfo()));
- ApplicationInstanceMapping.Builder builder = ApplicationInstanceMapping.newBuilder();
- builder.setApplicationId(request.getApplicationId());
- builder.setApplicationInstanceId(instanceId);
- responseObserver.onNext(builder.build());
- responseObserver.onCompleted();
- }
-
- @Override
- public void registerRecover(ApplicationInstanceRecover request, StreamObserver responseObserver) {
- long timeBucket = TimeBucketUtils.INSTANCE.getSecondTimeBucket(request.getRegisterTime());
- instanceIDService.recover(request.getApplicationInstanceId(), request.getApplicationId(), timeBucket, buildOsInfo(request.getOsinfo()));
- responseObserver.onNext(Downstream.newBuilder().build());
- responseObserver.onCompleted();
- }
-
- private String buildOsInfo(OSInfo osinfo) {
- JsonObject osInfoJson = new JsonObject();
- osInfoJson.addProperty("osName", osinfo.getOsName());
- osInfoJson.addProperty("hostName", osinfo.getHostname());
- osInfoJson.addProperty("processId", osinfo.getProcessNo());
-
- JsonArray ipv4Array = new JsonArray();
- for (String ipv4 : osinfo.getIpv4SList()) {
- ipv4Array.add(ipv4);
- }
- osInfoJson.add("ipv4s", ipv4Array);
- return osInfoJson.toString();
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java
deleted file mode 100644
index b3f16f2c6946..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc.handler;
-
-import io.grpc.stub.StreamObserver;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.jvm.ICpuMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IGCMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IInstanceHeartBeatService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IMemoryMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IMemoryPoolMetricService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.server.grpc.GRPCHandler;
-import org.skywalking.apm.network.proto.CPU;
-import org.skywalking.apm.network.proto.Downstream;
-import org.skywalking.apm.network.proto.GC;
-import org.skywalking.apm.network.proto.JVMMetrics;
-import org.skywalking.apm.network.proto.JVMMetricsServiceGrpc;
-import org.skywalking.apm.network.proto.Memory;
-import org.skywalking.apm.network.proto.MemoryPool;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsServiceImplBase implements GRPCHandler {
-
- private final Logger logger = LoggerFactory.getLogger(JVMMetricsServiceHandler.class);
-
- private final ICpuMetricService cpuMetricService;
- private final IGCMetricService gcMetricService;
- private final IMemoryMetricService memoryMetricService;
- private final IMemoryPoolMetricService memoryPoolMetricService;
- private final IInstanceHeartBeatService instanceHeartBeatService;
-
- public JVMMetricsServiceHandler(ModuleManager moduleManager) {
- this.cpuMetricService = moduleManager.find(AgentStreamModule.NAME).getService(ICpuMetricService.class);
- this.gcMetricService = moduleManager.find(AgentStreamModule.NAME).getService(IGCMetricService.class);
- this.memoryMetricService = moduleManager.find(AgentStreamModule.NAME).getService(IMemoryMetricService.class);
- this.memoryPoolMetricService = moduleManager.find(AgentStreamModule.NAME).getService(IMemoryPoolMetricService.class);
- this.instanceHeartBeatService = moduleManager.find(AgentStreamModule.NAME).getService(IInstanceHeartBeatService.class);
- }
-
- @Override public void collect(JVMMetrics request, StreamObserver responseObserver) {
- int instanceId = request.getApplicationInstanceId();
- logger.debug("receive the jvm metric from application instance, id: {}", instanceId);
-
- request.getMetricsList().forEach(metric -> {
- long time = TimeBucketUtils.INSTANCE.getSecondTimeBucket(metric.getTime());
- sendToInstanceHeartBeatService(instanceId, metric.getTime());
- sendToCpuMetricService(instanceId, time, metric.getCpu());
- sendToMemoryMetricService(instanceId, time, metric.getMemoryList());
- sendToMemoryPoolMetricService(instanceId, time, metric.getMemoryPoolList());
- sendToGCMetricService(instanceId, time, metric.getGcList());
- });
-
- responseObserver.onNext(Downstream.newBuilder().build());
- responseObserver.onCompleted();
- }
-
- private void sendToInstanceHeartBeatService(int instanceId, long heartBeatTime) {
- instanceHeartBeatService.send(instanceId, heartBeatTime);
- }
-
- private void sendToMemoryMetricService(int instanceId, long timeBucket, List memories) {
- memories.forEach(memory -> memoryMetricService.send(instanceId, timeBucket, memory.getIsHeap(), memory.getInit(), memory.getMax(), memory.getUsed(), memory.getCommitted()));
- }
-
- private void sendToMemoryPoolMetricService(int instanceId, long timeBucket,
- List memoryPools) {
-
- memoryPools.forEach(memoryPool -> memoryPoolMetricService.send(instanceId, timeBucket, memoryPool.getType().getNumber(), memoryPool.getInit(), memoryPool.getMax(), memoryPool.getUsed(), memoryPool.getCommited()));
- }
-
- private void sendToCpuMetricService(int instanceId, long timeBucket, CPU cpu) {
- cpuMetricService.send(instanceId, timeBucket, cpu.getUsagePercent());
- }
-
- private void sendToGCMetricService(int instanceId, long timeBucket, List gcs) {
- gcs.forEach(gc -> gcMetricService.send(instanceId, timeBucket, gc.getPhraseValue(), gc.getCount(), gc.getTime()));
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java
deleted file mode 100644
index 2fe84ea73718..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/ServiceNameDiscoveryServiceHandler.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc.handler;
-
-import io.grpc.stub.StreamObserver;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.register.IServiceNameService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.server.grpc.GRPCHandler;
-import org.skywalking.apm.network.proto.ServiceNameCollection;
-import org.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc;
-import org.skywalking.apm.network.proto.ServiceNameElement;
-import org.skywalking.apm.network.proto.ServiceNameMappingCollection;
-import org.skywalking.apm.network.proto.ServiceNameMappingElement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceNameDiscoveryServiceHandler extends ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceImplBase implements GRPCHandler {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceNameDiscoveryServiceHandler.class);
-
- private final IServiceNameService serviceNameService;
-
- public ServiceNameDiscoveryServiceHandler(ModuleManager moduleManager) {
- this.serviceNameService = moduleManager.find(AgentStreamModule.NAME).getService(IServiceNameService.class);
- }
-
- @Override public void discovery(ServiceNameCollection request,
- StreamObserver responseObserver) {
- List serviceNameElementList = request.getElementsList();
-
- ServiceNameMappingCollection.Builder builder = ServiceNameMappingCollection.newBuilder();
- for (ServiceNameElement serviceNameElement : serviceNameElementList) {
- int applicationId = serviceNameElement.getApplicationId();
- String serviceName = serviceNameElement.getServiceName();
- int serviceId = serviceNameService.getOrCreate(applicationId, serviceName);
-
- if (serviceId != 0) {
- ServiceNameMappingElement.Builder mappingElement = ServiceNameMappingElement.newBuilder();
- mappingElement.setServiceId(serviceId);
- mappingElement.setElement(serviceNameElement);
- builder.addElements(mappingElement);
- }
- }
-
- responseObserver.onNext(builder.build());
- responseObserver.onCompleted();
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java
deleted file mode 100644
index 0dbcfd5e4178..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/TraceSegmentServiceHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc.handler;
-
-import io.grpc.stub.StreamObserver;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.trace.ITraceSegmentService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.server.grpc.GRPCHandler;
-import org.skywalking.apm.network.proto.Downstream;
-import org.skywalking.apm.network.proto.TraceSegmentServiceGrpc;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class TraceSegmentServiceHandler extends TraceSegmentServiceGrpc.TraceSegmentServiceImplBase implements GRPCHandler {
-
- private final Logger logger = LoggerFactory.getLogger(TraceSegmentServiceHandler.class);
-
- private final ITraceSegmentService traceSegmentService;
-
- public TraceSegmentServiceHandler(ModuleManager moduleManager) {
- this.traceSegmentService = moduleManager.find(AgentStreamModule.NAME).getService(ITraceSegmentService.class);
- }
-
- @Override public StreamObserver collect(StreamObserver responseObserver) {
- return new StreamObserver() {
- @Override public void onNext(UpstreamSegment segment) {
- logger.debug("receive segment");
- traceSegmentService.send(segment);
- }
-
- @Override public void onError(Throwable throwable) {
- logger.error(throwable.getMessage(), throwable);
- }
-
- @Override public void onCompleted() {
- responseObserver.onNext(Downstream.newBuilder().build());
- responseObserver.onCompleted();
- }
- };
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java
deleted file mode 100644
index e729074ee60a..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc.handler.naming;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import org.skywalking.apm.collector.server.jetty.ArgumentsParseException;
-import org.skywalking.apm.collector.server.jetty.JettyHandler;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentGRPCNamingHandler extends JettyHandler {
-
- private final AgentGRPCNamingListener namingListener;
-
- public AgentGRPCNamingHandler(AgentGRPCNamingListener namingListener) {
- this.namingListener = namingListener;
- }
-
- @Override public String pathSpec() {
- return "/agent/gRPC";
- }
-
- @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException {
- Set servers = namingListener.getAddresses();
- JsonArray serverArray = new JsonArray();
- servers.forEach(serverArray::add);
- return serverArray;
- }
-
- @Override protected JsonElement doPost(HttpServletRequest req) throws ArgumentsParseException {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java
deleted file mode 100644
index 0d0d190c62ab..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/naming/AgentGRPCNamingListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc.handler.naming;
-
-import org.skywalking.apm.collector.agent.grpc.AgentGRPCModule;
-import org.skywalking.apm.collector.agent.grpc.AgentModuleGRPCProvider;
-import org.skywalking.apm.collector.cluster.ClusterModuleListener;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentGRPCNamingListener extends ClusterModuleListener {
-
- public static final String PATH = "/" + AgentGRPCModule.NAME + "/" + AgentModuleGRPCProvider.NAME;
-
- @Override public String path() {
- return PATH;
- }
-
- @Override public void serverJoinNotify(String serverAddress) {
-
- }
-
- @Override public void serverQuitNotify(String serverAddress) {
-
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
deleted file mode 100644
index 45eb31cb2922..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.agent.grpc.AgentModuleGRPCProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java b/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
deleted file mode 100644
index 1693fa0c54ba..000000000000
--- a/apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.grpc.handler;
-
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-import org.skywalking.apm.network.proto.Application;
-import org.skywalking.apm.network.proto.ApplicationMapping;
-import org.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationRegisterServiceHandlerTestCase {
-
- private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterServiceHandlerTestCase.class);
-
- private ApplicationRegisterServiceGrpc.ApplicationRegisterServiceBlockingStub stub;
-
- public void testRegister() {
- ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();
- stub = ApplicationRegisterServiceGrpc.newBlockingStub(channel);
-
- Application application = Application.newBuilder().addApplicationCode("test141").build();
- ApplicationMapping mapping = stub.register(application);
- logger.debug(mapping.getApplication(0).getKey() + ", " + mapping.getApplication(0).getValue());
- }
-}
diff --git a/apm-collector/apm-collector-agent-grpc/pom.xml b/apm-collector/apm-collector-agent-grpc/pom.xml
deleted file mode 100644
index c57e53acdff8..000000000000
--- a/apm-collector/apm-collector-agent-grpc/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-agent-grpc
- pom
-
- collector-agent-grpc-define
- collector-agent-grpc-provider
-
-
-
-
- org.skywalking
- apm-collector-core
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml
deleted file mode 100644
index f8f848969afe..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
- apm-collector-agent-jetty
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-agent-jetty-define
- jar
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentJettyModule.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentJettyModule.java
deleted file mode 100644
index be74cdfc1e67..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentJettyModule.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty;
-
-import org.skywalking.apm.collector.core.module.Module;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentJettyModule extends Module {
-
- public static final String NAME = "agent_jetty";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class[] services() {
- return new Class[0];
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
deleted file mode 100644
index 6bd8395e8ae0..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.agent.jetty.AgentJettyModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml
deleted file mode 100644
index 03bac8d60541..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
- apm-collector-agent-jetty
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-agent-jetty-provider
- jar
-
-
-
- org.skywalking
- collector-agent-jetty-define
- ${project.version}
-
-
- org.skywalking
- collector-jetty-manager-define
- ${project.version}
-
-
- org.skywalking
- collector-cluster-define
- ${project.version}
-
-
- org.skywalking
- collector-naming-define
- ${project.version}
-
-
- org.skywalking
- collector-agent-stream-define
- ${project.version}
-
-
-
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java
deleted file mode 100644
index ce317e3e369e..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyProvider.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty;
-
-import java.util.Properties;
-import org.skywalking.apm.collector.agent.jetty.handler.ApplicationRegisterServletHandler;
-import org.skywalking.apm.collector.agent.jetty.handler.InstanceDiscoveryServletHandler;
-import org.skywalking.apm.collector.agent.jetty.handler.ServiceNameDiscoveryServiceHandler;
-import org.skywalking.apm.collector.agent.jetty.handler.TraceSegmentServletHandler;
-import org.skywalking.apm.collector.agent.jetty.handler.naming.AgentJettyNamingHandler;
-import org.skywalking.apm.collector.agent.jetty.handler.naming.AgentJettyNamingListener;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.cluster.ClusterModule;
-import org.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.ModuleProvider;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.skywalking.apm.collector.jetty.manager.JettyManagerModule;
-import org.skywalking.apm.collector.jetty.manager.service.JettyManagerService;
-import org.skywalking.apm.collector.naming.NamingModule;
-import org.skywalking.apm.collector.naming.service.NamingHandlerRegisterService;
-import org.skywalking.apm.collector.server.Server;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentModuleJettyProvider extends ModuleProvider {
-
- public static final String NAME = "jetty";
- private static final String HOST = "host";
- private static final String PORT = "port";
- private static final String CONTEXT_PATH = "context_path";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class module() {
- return AgentJettyModule.class;
- }
-
- @Override public void prepare(Properties config) throws ServiceNotProvidedException {
-
- }
-
- @Override public void start(Properties config) throws ServiceNotProvidedException {
- String host = config.getProperty(HOST);
- Integer port = (Integer)config.get(PORT);
- String contextPath = config.getProperty(CONTEXT_PATH);
-
- ModuleRegisterService moduleRegisterService = getManager().find(ClusterModule.NAME).getService(ModuleRegisterService.class);
- moduleRegisterService.register(AgentJettyModule.NAME, this.name(), new AgentModuleJettyRegistration(host, port, contextPath));
-
- AgentJettyNamingListener namingListener = new AgentJettyNamingListener();
- ModuleListenerService moduleListenerService = getManager().find(ClusterModule.NAME).getService(ModuleListenerService.class);
- moduleListenerService.addListener(namingListener);
-
- NamingHandlerRegisterService namingHandlerRegisterService = getManager().find(NamingModule.NAME).getService(NamingHandlerRegisterService.class);
- namingHandlerRegisterService.register(new AgentJettyNamingHandler(namingListener));
-
- JettyManagerService managerService = getManager().find(JettyManagerModule.NAME).getService(JettyManagerService.class);
- Server jettyServer = managerService.createIfAbsent(host, port, contextPath);
- addHandlers(jettyServer);
- }
-
- @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
-
- }
-
- @Override public String[] requiredModules() {
- return new String[] {ClusterModule.NAME, NamingModule.NAME, JettyManagerModule.NAME, AgentStreamModule.NAME};
- }
-
- private void addHandlers(Server jettyServer) {
- jettyServer.addHandler(new TraceSegmentServletHandler(getManager()));
- jettyServer.addHandler(new ApplicationRegisterServletHandler(getManager()));
- jettyServer.addHandler(new InstanceDiscoveryServletHandler(getManager()));
- jettyServer.addHandler(new ServiceNameDiscoveryServiceHandler(getManager()));
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java
deleted file mode 100644
index 85158fb1c1ee..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/AgentModuleJettyRegistration.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty;
-
-import org.skywalking.apm.collector.cluster.ModuleRegistration;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentModuleJettyRegistration extends ModuleRegistration {
-
- private final String host;
- private final int port;
- private final String contextPath;
-
- public AgentModuleJettyRegistration(String host, int port, String contextPath) {
- this.host = host;
- this.port = port;
- this.contextPath = contextPath;
- }
-
- @Override public Value buildValue() {
- return new Value(host, port, contextPath);
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java
deleted file mode 100644
index 5d90e79fd1c2..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterServletHandler.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.register.IApplicationIDService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.server.jetty.ArgumentsParseException;
-import org.skywalking.apm.collector.server.jetty.JettyHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationRegisterServletHandler extends JettyHandler {
-
- private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterServletHandler.class);
-
- private final IApplicationIDService applicationIDService;
- private Gson gson = new Gson();
- private static final String APPLICATION_CODE = "c";
- private static final String APPLICATION_ID = "i";
-
- public ApplicationRegisterServletHandler(ModuleManager moduleManager) {
- this.applicationIDService = moduleManager.find(AgentStreamModule.NAME).getService(IApplicationIDService.class);
- }
-
- @Override public String pathSpec() {
- return "/application/register";
- }
-
- @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException {
- throw new UnsupportedOperationException();
- }
-
- @Override protected JsonElement doPost(HttpServletRequest req) throws ArgumentsParseException {
- JsonArray responseArray = new JsonArray();
- try {
- JsonArray applicationCodes = gson.fromJson(req.getReader(), JsonArray.class);
- for (int i = 0; i < applicationCodes.size(); i++) {
- String applicationCode = applicationCodes.get(i).getAsString();
- int applicationId = applicationIDService.getOrCreate(applicationCode);
- JsonObject mapping = new JsonObject();
- mapping.addProperty(APPLICATION_CODE, applicationCode);
- mapping.addProperty(APPLICATION_ID, applicationId);
- responseArray.add(mapping);
- }
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- return responseArray;
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java
deleted file mode 100644
index 17627398b3e1..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/InstanceDiscoveryServletHandler.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.register.IInstanceIDService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.server.jetty.ArgumentsParseException;
-import org.skywalking.apm.collector.server.jetty.JettyHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class InstanceDiscoveryServletHandler extends JettyHandler {
-
- private final Logger logger = LoggerFactory.getLogger(InstanceDiscoveryServletHandler.class);
-
- private final IInstanceIDService instanceIDService;
- private final Gson gson = new Gson();
-
- private static final String APPLICATION_ID = "ai";
- private static final String AGENT_UUID = "au";
- private static final String REGISTER_TIME = "rt";
- private static final String INSTANCE_ID = "ii";
- private static final String OS_INFO = "oi";
-
- public InstanceDiscoveryServletHandler(ModuleManager moduleManager) {
- this.instanceIDService = moduleManager.find(AgentStreamModule.NAME).getService(IInstanceIDService.class);
- }
-
- @Override public String pathSpec() {
- return "/instance/register";
- }
-
- @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException {
- throw new UnsupportedOperationException();
- }
-
- @Override protected JsonElement doPost(HttpServletRequest req) throws ArgumentsParseException {
- JsonObject responseJson = new JsonObject();
- try {
- JsonObject instance = gson.fromJson(req.getReader(), JsonObject.class);
- int applicationId = instance.get(APPLICATION_ID).getAsInt();
- String agentUUID = instance.get(AGENT_UUID).getAsString();
- long registerTime = instance.get(REGISTER_TIME).getAsLong();
- JsonObject osInfo = instance.get(OS_INFO).getAsJsonObject();
-
- int instanceId = instanceIDService.getOrCreate(applicationId, agentUUID, registerTime, osInfo.toString());
- responseJson.addProperty(APPLICATION_ID, applicationId);
- responseJson.addProperty(INSTANCE_ID, instanceId);
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- return responseJson;
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java
deleted file mode 100644
index 7e7b224f50d2..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/ServiceNameDiscoveryServiceHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.register.IServiceNameService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.server.jetty.ArgumentsParseException;
-import org.skywalking.apm.collector.server.jetty.JettyHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceNameDiscoveryServiceHandler extends JettyHandler {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceNameDiscoveryServiceHandler.class);
-
- private final IServiceNameService serviceNameService;
- private final Gson gson = new Gson();
-
- private static final String APPLICATION_ID = "ai";
- private static final String SERVICE_NAME = "sn";
- private static final String SERVICE_ID = "si";
- private static final String ELEMENT = "el";
-
- public ServiceNameDiscoveryServiceHandler(ModuleManager moduleManager) {
- this.serviceNameService = moduleManager.find(AgentStreamModule.NAME).getService(IServiceNameService.class);
- }
-
- @Override public String pathSpec() {
- return "/servicename/discovery";
- }
-
- @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException {
- throw new UnsupportedOperationException();
- }
-
- @Override protected JsonElement doPost(HttpServletRequest req) throws ArgumentsParseException {
- JsonArray responseArray = new JsonArray();
- try {
- JsonArray services = gson.fromJson(req.getReader(), JsonArray.class);
- for (JsonElement service : services) {
- int applicationId = service.getAsJsonObject().get(APPLICATION_ID).getAsInt();
- String serviceName = service.getAsJsonObject().get(SERVICE_NAME).getAsString();
-
- int serviceId = serviceNameService.getOrCreate(applicationId, serviceName);
- if (serviceId != 0) {
- JsonObject responseJson = new JsonObject();
- responseJson.addProperty(SERVICE_ID, serviceId);
- responseJson.add(ELEMENT, service);
- responseArray.add(responseJson);
- }
- }
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- return responseArray;
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java
deleted file mode 100644
index c880674ff68c..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/TraceSegmentServletHandler.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.JsonElement;
-import com.google.gson.stream.JsonReader;
-import java.io.BufferedReader;
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import org.skywalking.apm.collector.agent.jetty.handler.reader.TraceSegment;
-import org.skywalking.apm.collector.agent.jetty.handler.reader.TraceSegmentJsonReader;
-import org.skywalking.apm.collector.agent.stream.AgentStreamModule;
-import org.skywalking.apm.collector.agent.stream.service.trace.ITraceSegmentService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.server.jetty.ArgumentsParseException;
-import org.skywalking.apm.collector.server.jetty.JettyHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class TraceSegmentServletHandler extends JettyHandler {
-
- private final Logger logger = LoggerFactory.getLogger(TraceSegmentServletHandler.class);
-
- private final ITraceSegmentService traceSegmentService;
-
- public TraceSegmentServletHandler(ModuleManager moduleManager) {
- this.traceSegmentService = moduleManager.find(AgentStreamModule.NAME).getService(ITraceSegmentService.class);
- }
-
- @Override public String pathSpec() {
- return "/segments";
- }
-
- @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException {
- throw new UnsupportedOperationException();
- }
-
- @Override protected JsonElement doPost(HttpServletRequest req) throws ArgumentsParseException {
- logger.debug("receive stream segment");
- try {
- BufferedReader bufferedReader = req.getReader();
- read(bufferedReader);
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- return null;
- }
-
- private TraceSegmentJsonReader jsonReader = new TraceSegmentJsonReader();
-
- private void read(BufferedReader bufferedReader) throws IOException {
- JsonReader reader = new JsonReader(bufferedReader);
-
- reader.beginArray();
- while (reader.hasNext()) {
- TraceSegment traceSegment = jsonReader.read(reader);
- traceSegmentService.send(traceSegment.getUpstreamSegment());
- }
- reader.endArray();
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java
deleted file mode 100644
index ef089549346c..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.naming;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import org.skywalking.apm.collector.server.jetty.ArgumentsParseException;
-import org.skywalking.apm.collector.server.jetty.JettyHandler;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentJettyNamingHandler extends JettyHandler {
-
- private final AgentJettyNamingListener namingListener;
-
- public AgentJettyNamingHandler(AgentJettyNamingListener namingListener) {
- this.namingListener = namingListener;
- }
-
- @Override public String pathSpec() {
- return "/agent/jetty";
- }
-
- @Override protected JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException {
- Set servers = namingListener.getAddresses();
- JsonArray serverArray = new JsonArray();
- servers.forEach(serverArray::add);
- return serverArray;
- }
-
- @Override protected JsonElement doPost(HttpServletRequest req) throws ArgumentsParseException {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java
deleted file mode 100644
index e9592cd12969..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/naming/AgentJettyNamingListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.naming;
-
-import org.skywalking.apm.collector.agent.jetty.AgentJettyModule;
-import org.skywalking.apm.collector.agent.jetty.AgentModuleJettyProvider;
-import org.skywalking.apm.collector.cluster.ClusterModuleListener;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentJettyNamingListener extends ClusterModuleListener {
-
- public static final String PATH = "/" + AgentJettyModule.NAME + "/" + AgentModuleJettyProvider.NAME;
-
- @Override public String path() {
- return PATH;
- }
-
- @Override public void serverJoinNotify(String serverAddress) {
-
- }
-
- @Override public void serverQuitNotify(String serverAddress) {
-
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java
deleted file mode 100644
index 8d05026e0410..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/KeyWithStringValueJsonReader.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import com.google.gson.stream.JsonReader;
-import java.io.IOException;
-import org.skywalking.apm.network.proto.KeyWithStringValue;
-
-/**
- * @author peng-yongsheng
- */
-public class KeyWithStringValueJsonReader implements StreamJsonReader {
-
- private static final String KEY = "k";
- private static final String VALUE = "v";
-
- @Override public KeyWithStringValue read(JsonReader reader) throws IOException {
- KeyWithStringValue.Builder builder = KeyWithStringValue.newBuilder();
-
- reader.beginObject();
- while (reader.hasNext()) {
- switch (reader.nextName()) {
- case KEY:
- builder.setKey(reader.nextString());
- break;
- case VALUE:
- builder.setValue(reader.nextString());
- break;
- default:
- reader.skipValue();
- break;
- }
- }
- reader.endObject();
-
- return builder.build();
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java
deleted file mode 100644
index 9448192ceb72..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/LogJsonReader.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import com.google.gson.stream.JsonReader;
-import java.io.IOException;
-import org.skywalking.apm.network.proto.LogMessage;
-
-/**
- * @author peng-yongsheng
- */
-public class LogJsonReader implements StreamJsonReader {
-
- private KeyWithStringValueJsonReader keyWithStringValueJsonReader = new KeyWithStringValueJsonReader();
-
- private static final String TIME = "ti";
- private static final String LOG_DATA = "ld";
-
- @Override public LogMessage read(JsonReader reader) throws IOException {
- LogMessage.Builder builder = LogMessage.newBuilder();
-
- while (reader.hasNext()) {
- switch (reader.nextName()) {
- case TIME:
- builder.setTime(reader.nextLong());
- case LOG_DATA:
- reader.beginArray();
- while (reader.hasNext()) {
- builder.addData(keyWithStringValueJsonReader.read(reader));
- }
- reader.endArray();
- default:
- reader.skipValue();
- }
- }
-
- return builder.build();
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java
deleted file mode 100644
index c9ed25301205..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/ReferenceJsonReader.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import com.google.gson.stream.JsonReader;
-import java.io.IOException;
-import org.skywalking.apm.network.proto.TraceSegmentReference;
-
-/**
- * @author peng-yongsheng
- */
-public class ReferenceJsonReader implements StreamJsonReader {
-
- private UniqueIdJsonReader uniqueIdJsonReader = new UniqueIdJsonReader();
-
- private static final String PARENT_TRACE_SEGMENT_ID = "ts";
- private static final String PARENT_APPLICATION_ID = "ai";
- private static final String PARENT_SPAN_ID = "si";
- private static final String PARENT_SERVICE_ID = "vi";
- private static final String PARENT_SERVICE_NAME = "vn";
- private static final String NETWORK_ADDRESS_ID = "ni";
- private static final String NETWORK_ADDRESS = "nn";
- private static final String ENTRY_APPLICATION_INSTANCE_ID = "ea";
- private static final String ENTRY_SERVICE_ID = "ei";
- private static final String ENTRY_SERVICE_NAME = "en";
- private static final String REF_TYPE_VALUE = "rv";
-
- @Override public TraceSegmentReference read(JsonReader reader) throws IOException {
- TraceSegmentReference.Builder builder = TraceSegmentReference.newBuilder();
-
- reader.beginObject();
- while (reader.hasNext()) {
- switch (reader.nextName()) {
- case PARENT_TRACE_SEGMENT_ID:
- builder.setParentTraceSegmentId(uniqueIdJsonReader.read(reader));
- break;
- case PARENT_APPLICATION_ID:
- builder.setParentApplicationInstanceId(reader.nextInt());
- break;
- case PARENT_SPAN_ID:
- builder.setParentSpanId(reader.nextInt());
- break;
- case PARENT_SERVICE_ID:
- builder.setParentServiceId(reader.nextInt());
- break;
- case PARENT_SERVICE_NAME:
- builder.setParentServiceName(reader.nextString());
- break;
- case NETWORK_ADDRESS_ID:
- builder.setNetworkAddressId(reader.nextInt());
- break;
- case NETWORK_ADDRESS:
- builder.setNetworkAddress(reader.nextString());
- break;
- case ENTRY_APPLICATION_INSTANCE_ID:
- builder.setEntryApplicationInstanceId(reader.nextInt());
- break;
- case ENTRY_SERVICE_ID:
- builder.setEntryServiceId(reader.nextInt());
- break;
- case ENTRY_SERVICE_NAME:
- builder.setEntryServiceName(reader.nextString());
- break;
- case REF_TYPE_VALUE:
- builder.setRefTypeValue(reader.nextInt());
- break;
- default:
- reader.skipValue();
- break;
- }
- }
- reader.endObject();
-
- return builder.build();
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java
deleted file mode 100644
index 0997202cd516..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/SegmentJsonReader.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import com.google.gson.stream.JsonReader;
-import java.io.IOException;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentJsonReader implements StreamJsonReader {
-
- private final Logger logger = LoggerFactory.getLogger(SegmentJsonReader.class);
-
- private UniqueIdJsonReader uniqueIdJsonReader = new UniqueIdJsonReader();
- private ReferenceJsonReader referenceJsonReader = new ReferenceJsonReader();
- private SpanJsonReader spanJsonReader = new SpanJsonReader();
-
- private static final String TRACE_SEGMENT_ID = "ts";
- private static final String APPLICATION_ID = "ai";
- private static final String APPLICATION_INSTANCE_ID = "ii";
- private static final String TRACE_SEGMENT_REFERENCE = "rs";
- private static final String SPANS = "ss";
-
- @Override public TraceSegmentObject.Builder read(JsonReader reader) throws IOException {
- TraceSegmentObject.Builder builder = TraceSegmentObject.newBuilder();
-
- reader.beginObject();
- while (reader.hasNext()) {
- switch (reader.nextName()) {
- case TRACE_SEGMENT_ID:
- builder.setTraceSegmentId(uniqueIdJsonReader.read(reader));
- if (logger.isDebugEnabled()) {
- StringBuilder segmentId = new StringBuilder();
- builder.getTraceSegmentId().getIdPartsList().forEach(idPart -> segmentId.append(idPart));
- logger.debug("segment id: {}", segmentId);
- }
- break;
- case APPLICATION_ID:
- builder.setApplicationId(reader.nextInt());
- break;
- case APPLICATION_INSTANCE_ID:
- builder.setApplicationInstanceId(reader.nextInt());
- break;
- case TRACE_SEGMENT_REFERENCE:
- reader.beginArray();
- while (reader.hasNext()) {
- builder.addRefs(referenceJsonReader.read(reader));
- }
- reader.endArray();
- break;
- case SPANS:
- reader.beginArray();
- while (reader.hasNext()) {
- builder.addSpans(spanJsonReader.read(reader));
- }
- reader.endArray();
- break;
- default:
- reader.skipValue();
- break;
- }
- }
- reader.endObject();
-
- return builder;
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java
deleted file mode 100644
index 121d83b6fb04..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/SpanJsonReader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import com.google.gson.stream.JsonReader;
-import java.io.IOException;
-import org.skywalking.apm.network.proto.SpanObject;
-
-/**
- * @author peng-yongsheng
- */
-public class SpanJsonReader implements StreamJsonReader {
-
- private KeyWithStringValueJsonReader keyWithStringValueJsonReader = new KeyWithStringValueJsonReader();
- private LogJsonReader logJsonReader = new LogJsonReader();
-
- private static final String SPAN_ID = "si";
- private static final String SPAN_TYPE_VALUE = "tv";
- private static final String SPAN_LAYER_VALUE = "lv";
- private static final String PARENT_SPAN_ID = "ps";
- private static final String START_TIME = "st";
- private static final String END_TIME = "et";
- private static final String COMPONENT_ID = "ci";
- private static final String COMPONENT_NAME = "cn";
- private static final String OPERATION_NAME_ID = "oi";
- private static final String OPERATION_NAME = "on";
- private static final String PEER_ID = "pi";
- private static final String PEER = "pn";
- private static final String IS_ERROR = "ie";
- private static final String TAGS = "to";
- private static final String LOGS = "lo";
-
- @Override public SpanObject read(JsonReader reader) throws IOException {
- SpanObject.Builder builder = SpanObject.newBuilder();
-
- reader.beginObject();
- while (reader.hasNext()) {
- switch (reader.nextName()) {
- case SPAN_ID:
- builder.setSpanId(reader.nextInt());
- break;
- case SPAN_TYPE_VALUE:
- builder.setSpanTypeValue(reader.nextInt());
- break;
- case SPAN_LAYER_VALUE:
- builder.setSpanLayerValue(reader.nextInt());
- break;
- case PARENT_SPAN_ID:
- builder.setParentSpanId(reader.nextInt());
- break;
- case START_TIME:
- builder.setStartTime(reader.nextLong());
- break;
- case END_TIME:
- builder.setEndTime(reader.nextLong());
- break;
- case COMPONENT_ID:
- builder.setComponentId(reader.nextInt());
- break;
- case COMPONENT_NAME:
- builder.setComponent(reader.nextString());
- break;
- case OPERATION_NAME_ID:
- builder.setOperationNameId(reader.nextInt());
- break;
- case OPERATION_NAME:
- builder.setOperationName(reader.nextString());
- break;
- case PEER_ID:
- builder.setPeerId(reader.nextInt());
- break;
- case PEER:
- builder.setPeer(reader.nextString());
- break;
- case IS_ERROR:
- builder.setIsError(reader.nextBoolean());
- break;
- case TAGS:
- reader.beginArray();
- while (reader.hasNext()) {
- builder.addTags(keyWithStringValueJsonReader.read(reader));
- }
- reader.endArray();
- break;
- case LOGS:
- reader.beginArray();
- while (reader.hasNext()) {
- builder.addLogs(logJsonReader.read(reader));
- }
- reader.endArray();
- break;
- default:
- reader.skipValue();
- break;
- }
- }
- reader.endObject();
-
- return builder.build();
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java
deleted file mode 100644
index c5a0b255fe65..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/StreamJsonReader.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import com.google.gson.stream.JsonReader;
-import java.io.IOException;
-
-/**
- * @author peng-yongsheng
- */
-public interface StreamJsonReader {
- T read(JsonReader reader) throws IOException;
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java
deleted file mode 100644
index d7d4164dcbbf..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegment.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-import org.skywalking.apm.network.proto.UniqueId;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-
-/**
- * @author peng-yongsheng
- */
-public class TraceSegment {
-
- private UpstreamSegment.Builder builder;
-
- public TraceSegment() {
- builder = UpstreamSegment.newBuilder();
- }
-
- public void addGlobalTraceId(UniqueId.Builder globalTraceId) {
- builder.addGlobalTraceIds(globalTraceId);
- }
-
- public void setTraceSegmentBuilder(TraceSegmentObject.Builder traceSegmentBuilder) {
- builder.setSegment(traceSegmentBuilder.build().toByteString());
- }
-
- public UpstreamSegment getUpstreamSegment() {
- return builder.build();
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java
deleted file mode 100644
index 125cb35ba4ea..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/TraceSegmentJsonReader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import com.google.gson.stream.JsonReader;
-import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class TraceSegmentJsonReader implements StreamJsonReader {
-
- private final Logger logger = LoggerFactory.getLogger(TraceSegmentJsonReader.class);
-
- private UniqueIdJsonReader uniqueIdJsonReader = new UniqueIdJsonReader();
- private SegmentJsonReader segmentJsonReader = new SegmentJsonReader();
-
- private static final String GLOBAL_TRACE_IDS = "gt";
- private static final String SEGMENT = "sg";
-
- @Override public TraceSegment read(JsonReader reader) throws IOException {
- TraceSegment traceSegment = new TraceSegment();
-
- reader.beginObject();
- while (reader.hasNext()) {
- switch (reader.nextName()) {
- case GLOBAL_TRACE_IDS:
- reader.beginArray();
- while (reader.hasNext()) {
- traceSegment.addGlobalTraceId(uniqueIdJsonReader.read(reader));
- }
- reader.endArray();
-
- break;
- case SEGMENT:
- traceSegment.setTraceSegmentBuilder(segmentJsonReader.read(reader));
- break;
- default:
- reader.skipValue();
- break;
- }
- }
- reader.endObject();
-
- return traceSegment;
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java
deleted file mode 100644
index a172f98e9cf9..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/java/org/skywalking/apm/collector/agent/jetty/handler/reader/UniqueIdJsonReader.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler.reader;
-
-import com.google.gson.stream.JsonReader;
-import java.io.IOException;
-import org.skywalking.apm.network.proto.UniqueId;
-
-/**
- * @author peng-yongsheng
- */
-public class UniqueIdJsonReader implements StreamJsonReader {
-
- @Override public UniqueId.Builder read(JsonReader reader) throws IOException {
- UniqueId.Builder builder = UniqueId.newBuilder();
-
- reader.beginArray();
- while (reader.hasNext()) {
- builder.addIdParts(reader.nextLong());
- }
- reader.endArray();
- return builder;
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
deleted file mode 100644
index dead2c5cf88d..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.agent.jetty.AgentModuleJettyProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java
deleted file mode 100644
index cd534328599c..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/ApplicationRegisterPost.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.JsonElement;
-import java.io.IOException;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationRegisterPost {
-
- public void send(String jsonFile) throws IOException {
- JsonElement application = JsonFileReader.INSTANCE.read(jsonFile);
- HttpClientTools.INSTANCE.post("http://localhost:12800/application/register", application.toString());
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java
deleted file mode 100644
index e97b3857abe1..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/HttpClientTools.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-import org.apache.http.Consts;
-import org.apache.http.HttpEntity;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public enum HttpClientTools {
- INSTANCE;
-
- private final Logger logger = LoggerFactory.getLogger(HttpClientTools.class);
-
- public String get(String url, List params) throws IOException {
- CloseableHttpClient httpClient = HttpClients.createDefault();
- try {
- HttpGet httpget = new HttpGet(url);
- String paramStr = EntityUtils.toString(new UrlEncodedFormEntity(params));
- httpget.setURI(new URI(httpget.getURI().toString() + "?" + paramStr));
- logger.debug("executing get request {}", httpget.getURI());
-
- try (CloseableHttpResponse response = httpClient.execute(httpget)) {
- HttpEntity entity = response.getEntity();
- if (entity != null) {
- return EntityUtils.toString(entity);
- }
- }
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- } finally {
- try {
- httpClient.close();
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- }
- return null;
- }
-
- public String post(String url, String data) throws IOException {
- CloseableHttpClient httpClient = HttpClients.createDefault();
- try {
- HttpPost httppost = new HttpPost(url);
- httppost.setEntity(new StringEntity(data, Consts.UTF_8));
- logger.debug("executing post request {}", httppost.getURI());
- try (CloseableHttpResponse response = httpClient.execute(httppost)) {
- HttpEntity entity = response.getEntity();
- if (entity != null) {
- return EntityUtils.toString(entity);
- }
- }
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- } finally {
- try {
- httpClient.close();
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- }
- }
- return null;
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java
deleted file mode 100644
index 12ef75ddafe9..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/InstanceRegisterPost.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.JsonElement;
-import java.io.IOException;
-
-/**
- * @author peng-yongsheng
- */
-public class InstanceRegisterPost {
-
- public void send(String jsonFile) throws IOException {
- JsonElement instance = JsonFileReader.INSTANCE.read(jsonFile);
- HttpClientTools.INSTANCE.post("http://localhost:12800/instance/register", instance.toString());
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java
deleted file mode 100644
index 0353c8214a42..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/JsonFileReader.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public enum JsonFileReader {
- INSTANCE;
-
- private final Logger logger = LoggerFactory.getLogger(JsonFileReader.class);
-
- public JsonElement read(String fileName) throws FileNotFoundException {
- String path = this.getClass().getClassLoader().getResource(fileName).getFile();
- logger.debug("path: {}", path);
- JsonParser jsonParser = new JsonParser();
- return jsonParser.parse(new FileReader(path));
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java
deleted file mode 100644
index 297eab2a264c..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/SegmentPost.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.JsonElement;
-import java.io.IOException;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentPost {
-
- public static void main(String[] args) throws IOException {
- ApplicationRegisterPost applicationRegisterPost = new ApplicationRegisterPost();
- applicationRegisterPost.send("json/application-register-consumer.json");
- applicationRegisterPost.send("json/application-register-provider.json");
-
- InstanceRegisterPost instanceRegisterPost = new InstanceRegisterPost();
- instanceRegisterPost.send("json/instance-register-consumer.json");
- instanceRegisterPost.send("json/instance-register-provider.json");
-
- ServiceNameRegisterPost serviceNameRegisterPost = new ServiceNameRegisterPost();
- serviceNameRegisterPost.send("json/servicename-register-consumer.json");
- serviceNameRegisterPost.send("json/servicename-register-provider.json");
-
- JsonElement provider = JsonFileReader.INSTANCE.read("json/dubbox-provider.json");
- JsonElement consumer = JsonFileReader.INSTANCE.read("json/dubbox-consumer.json");
-
- for (int i = 0; i < 1000; i++) {
- HttpClientTools.INSTANCE.post("http://localhost:12800/segments", provider.toString());
- HttpClientTools.INSTANCE.post("http://localhost:12800/segments", consumer.toString());
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java
deleted file mode 100644
index 6e6cde68d231..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/java/org/skywalking/apm/collector/agent/jetty/handler/ServiceNameRegisterPost.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.jetty.handler;
-
-import com.google.gson.JsonElement;
-import java.io.IOException;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceNameRegisterPost {
-
- public void send(String jsonFile) throws IOException {
- JsonElement instance = JsonFileReader.INSTANCE.read(jsonFile);
- HttpClientTools.INSTANCE.post("http://localhost:12800/servicename/discovery", instance.toString());
- }
-}
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json
deleted file mode 100644
index b7f2436357dc..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-consumer.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
- "dubbox-consumer"
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json
deleted file mode 100644
index 08a2c156bcd2..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/application-register-provider.json
+++ /dev/null
@@ -1,3 +0,0 @@
-[
- "dubbox-provider"
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json
deleted file mode 100644
index 453dce3ebea0..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-consumer.json
+++ /dev/null
@@ -1,71 +0,0 @@
-[
- {
- "gt": [
- [
- 230150,
- 185809,
- 24040000
- ]
- ],
- "sg": {
- "ts": [
- 230150,
- 185809,
- 24040000
- ],
- "ai": -1,
- "ii": 1,
- "rs": [],
- "ss": [
- {
- "si": 1,
- "tv": 1,
- "lv": 1,
- "ps": 0,
- "st": 1501858094526,
- "et": 1501858097004,
- "ci": 3,
- "cn": "",
- "oi": 0,
- "on": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()",
- "pi": 0,
- "pn": "172.25.0.4:20880",
- "ie": false,
- "to": [
- {
- "k": "url",
- "v": "rest://172.25.0.4:20880/org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
- }
- ],
- "lo": []
- },
- {
- "si": 0,
- "tv": 0,
- "lv": 2,
- "ps": -1,
- "st": 1501858092409,
- "et": 1501858097033,
- "ci": 1,
- "cn": "",
- "oi": 0,
- "on": "/dubbox-case/case/dubbox-rest",
- "pi": 0,
- "pn": "",
- "ie": false,
- "to": [
- {
- "k": "url",
- "v": "http://localhost:18080/dubbox-case/case/dubbox-rest"
- },
- {
- "k": "http.method",
- "v": "GET"
- }
- ],
- "lo": []
- }
- ]
- }
- }
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json
deleted file mode 100644
index 709f57760d3f..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/dubbox-provider.json
+++ /dev/null
@@ -1,67 +0,0 @@
-[
- {
- "gt": [
- [
- 230150,
- 185809,
- 24040000
- ]
- ],
- "sg": {
- "ts": [
- 137150,
- 185809,
- 48780000
- ],
- "ai": 2,
- "ii": 2,
- "rs": [
- {
- "ts": [
- 230150,
- 185809,
- 24040000
- ],
- "ai": -1,
- "si": 1,
- "vi": 0,
- "vn": "/dubbox-case/case/dubbox-rest",
- "ni": 0,
- "nn": "172.25.0.4:20880",
- "ea": 2,
- "ei": 0,
- "en": "/dubbox-case/case/dubbox-rest",
- "rn": 0
- }
- ],
- "ss": [
- {
- "si": 0,
- "tv": 0,
- "lv": 2,
- "ps": -1,
- "st": 1501858094726,
- "et": 1501858096804,
- "ci": 3,
- "cn": "",
- "oi": 0,
- "on": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()",
- "pi": 0,
- "pn": "",
- "ie": false,
- "to": [
- {
- "k": "url",
- "v": "rest://172.25.0.4:20880/org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
- },
- {
- "k": "http.method",
- "v": "GET"
- }
- ],
- "lo": []
- }
- ]
- }
- }
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json
deleted file mode 100644
index 139dc57438b9..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-consumer.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "ai": -1,
- "au": "dubbox-consumer",
- "rt": 1501858094526,
- "oi": {
- "any_name": "any_value",
- "any_name1": "any_value1"
- }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json
deleted file mode 100644
index 976928f9ca36..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/instance-register-provider.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "ai": 2,
- "au": "dubbox-provider",
- "rt": 1501858094526,
- "oi": {
- "any_name": "any_value",
- "any_name1": "any_value1"
- }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json
deleted file mode 100644
index 9cc919204c1c..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-consumer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
- "ai": -1,
- "sn": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
- }
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json b/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json
deleted file mode 100644
index 0e9a961532e6..000000000000
--- a/apm-collector/apm-collector-agent-jetty/collector-agent-jetty-provider/src/test/resources/json/servicename-register-provider.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
- "ai": 2,
- "sn": "org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"
- }
-]
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-jetty/pom.xml b/apm-collector/apm-collector-agent-jetty/pom.xml
deleted file mode 100644
index 79454b956911..000000000000
--- a/apm-collector/apm-collector-agent-jetty/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-agent-jetty
- pom
-
- collector-agent-jetty-define
- collector-agent-jetty-provider
-
-
-
-
- org.skywalking
- apm-collector-core
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/pom.xml b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/pom.xml
deleted file mode 100644
index fb4fd771a744..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- apm-collector-agent-stream
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-agent-stream-define
- jar
-
-
-
- org.skywalking
- apm-network
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamModule.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamModule.java
deleted file mode 100644
index 01e960c241d6..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamModule.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.service.jvm.ICpuMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IGCMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IInstanceHeartBeatService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IMemoryMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IMemoryPoolMetricService;
-import org.skywalking.apm.collector.agent.stream.service.register.IApplicationIDService;
-import org.skywalking.apm.collector.agent.stream.service.register.IInstanceIDService;
-import org.skywalking.apm.collector.agent.stream.service.register.IServiceNameService;
-import org.skywalking.apm.collector.agent.stream.service.trace.ITraceSegmentService;
-import org.skywalking.apm.collector.core.module.Module;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentStreamModule extends Module {
-
- public static final String NAME = "agent_stream";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class[] services() {
- List classes = new ArrayList<>();
-
- addRegisterService(classes);
- addJVMService(classes);
- classes.add(ITraceSegmentService.class);
-
- return classes.toArray(new Class[] {});
- }
-
- private void addRegisterService(List classes) {
- classes.add(IApplicationIDService.class);
- classes.add(IInstanceIDService.class);
- classes.add(IServiceNameService.class);
- }
-
- private void addJVMService(List classes) {
- classes.add(ICpuMetricService.class);
- classes.add(IGCMetricService.class);
- classes.add(IMemoryMetricService.class);
- classes.add(IMemoryPoolMetricService.class);
- classes.add(IInstanceHeartBeatService.class);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/ICpuMetricService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/ICpuMetricService.java
deleted file mode 100644
index 659f881ead7f..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/ICpuMetricService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.jvm;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface ICpuMetricService extends Service {
- void send(int instanceId, long timeBucket, double usagePercent);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IGCMetricService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IGCMetricService.java
deleted file mode 100644
index 62038953d7c6..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IGCMetricService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.jvm;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface IGCMetricService extends Service {
- void send(int instanceId, long timeBucket, int phraseValue, long count, long time);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IInstanceHeartBeatService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IInstanceHeartBeatService.java
deleted file mode 100644
index 53c487f7c4e5..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IInstanceHeartBeatService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.jvm;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface IInstanceHeartBeatService extends Service {
- void send(int instanceId, long heartBeatTime);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IMemoryMetricService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IMemoryMetricService.java
deleted file mode 100644
index 917ac2900b70..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IMemoryMetricService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.jvm;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface IMemoryMetricService extends Service {
- void send(int instanceId, long timeBucket, boolean isHeap, long init, long max, long used, long commited);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IMemoryPoolMetricService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IMemoryPoolMetricService.java
deleted file mode 100644
index 88766a509854..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/jvm/IMemoryPoolMetricService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.jvm;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface IMemoryPoolMetricService extends Service {
- void send(int instanceId, long timeBucket, int poolType, long init, long max, long used, long commited);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IApplicationIDService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IApplicationIDService.java
deleted file mode 100644
index 20e755370696..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IApplicationIDService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.register;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface IApplicationIDService extends Service {
- int getOrCreate(String applicationCode);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IInstanceIDService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IInstanceIDService.java
deleted file mode 100644
index efb3542fa8fa..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IInstanceIDService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.register;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface IInstanceIDService extends Service {
- int getOrCreate(int applicationId, String agentUUID, long registerTime, String osInfo);
-
- void recover(int instanceId, int applicationId, long registerTime, String osInfo);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IServiceNameService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IServiceNameService.java
deleted file mode 100644
index 3dc3c5d16c02..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/register/IServiceNameService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.register;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface IServiceNameService extends Service {
- int getOrCreate(int applicationId, String serviceName);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/trace/ITraceSegmentService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/trace/ITraceSegmentService.java
deleted file mode 100644
index 581e62319add..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/java/org/skywalking/apm/collector/agent/stream/service/trace/ITraceSegmentService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.service.trace;
-
-import org.skywalking.apm.collector.core.module.Service;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-
-/**
- * @author peng-yongsheng
- */
-public interface ITraceSegmentService extends Service {
- void send(UpstreamSegment segment);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
deleted file mode 100644
index 2016bceaed62..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.agent.stream.AgentStreamModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/pom.xml b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/pom.xml
deleted file mode 100644
index 132b29e68691..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
- apm-collector-agent-stream
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-agent-stream-provider
- jar
-
-
-
- org.skywalking
- collector-agent-stream-define
- ${project.version}
-
-
- org.skywalking
- collector-storage-define
- ${project.version}
-
-
- org.skywalking
- collector-cache-define
- ${project.version}
-
-
- org.skywalking
- apm-collector-stream
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamBootStartup.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamBootStartup.java
deleted file mode 100644
index 7757ad1b97a7..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamBootStartup.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream;
-
-import org.skywalking.apm.collector.agent.stream.graph.JvmMetricStreamGraph;
-import org.skywalking.apm.collector.agent.stream.graph.RegisterStreamGraph;
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.stream.timer.PersistenceTimer;
-import org.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentStreamBootStartup {
-
- private final ModuleManager moduleManager;
- private final WorkerCreateListener workerCreateListener;
-
- public AgentStreamBootStartup(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- this.workerCreateListener = new WorkerCreateListener();
- }
-
- public void start() {
- createJVMGraph();
- createRegisterGraph();
- createTraceGraph();
-
- PersistenceTimer timer = new PersistenceTimer();
- timer.start(moduleManager, workerCreateListener.getPersistenceWorkers());
-
- }
-
- private void createJVMGraph() {
- JvmMetricStreamGraph jvmMetricStreamGraph = new JvmMetricStreamGraph(moduleManager, workerCreateListener);
- jvmMetricStreamGraph.createCpuMetricGraph();
- jvmMetricStreamGraph.createGcMetricGraph();
- jvmMetricStreamGraph.createMemoryMetricGraph();
- jvmMetricStreamGraph.createMemoryPoolMetricGraph();
- jvmMetricStreamGraph.createHeartBeatGraph();
- }
-
- private void createRegisterGraph() {
- RegisterStreamGraph registerStreamGraph = new RegisterStreamGraph(moduleManager, workerCreateListener);
- registerStreamGraph.createApplicationRegisterGraph();
- registerStreamGraph.createInstanceRegisterGraph();
- registerStreamGraph.createServiceNameRegisterGraph();
- }
-
- private void createTraceGraph() {
- TraceStreamGraph traceStreamGraph = new TraceStreamGraph(moduleManager, workerCreateListener);
- traceStreamGraph.createSegmentStandardizationGraph();
- traceStreamGraph.createGlobalTraceGraph();
- traceStreamGraph.createInstPerformanceGraph();
- traceStreamGraph.createNodeComponentGraph();
- traceStreamGraph.createNodeMappingGraph();
- traceStreamGraph.createNodeReferenceGraph();
- traceStreamGraph.createServiceEntryGraph();
- traceStreamGraph.createServiceReferenceGraph();
- traceStreamGraph.createSegmentGraph();
- traceStreamGraph.createSegmentCostGraph();
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamModuleProvider.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamModuleProvider.java
deleted file mode 100644
index c8c0d6e78e94..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/AgentStreamModuleProvider.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream;
-
-import java.util.Properties;
-import org.skywalking.apm.collector.agent.stream.buffer.BufferFileConfig;
-import org.skywalking.apm.collector.agent.stream.service.jvm.ICpuMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IGCMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IInstanceHeartBeatService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IMemoryMetricService;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IMemoryPoolMetricService;
-import org.skywalking.apm.collector.agent.stream.service.register.IApplicationIDService;
-import org.skywalking.apm.collector.agent.stream.service.register.IInstanceIDService;
-import org.skywalking.apm.collector.agent.stream.service.register.IServiceNameService;
-import org.skywalking.apm.collector.agent.stream.service.trace.ITraceSegmentService;
-import org.skywalking.apm.collector.agent.stream.worker.AgentStreamRemoteDataRegister;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.CpuMetricService;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.GCMetricService;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.InstanceHeartBeatService;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.MemoryMetricService;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.MemoryPoolMetricService;
-import org.skywalking.apm.collector.agent.stream.worker.register.ApplicationIDService;
-import org.skywalking.apm.collector.agent.stream.worker.register.InstanceIDService;
-import org.skywalking.apm.collector.agent.stream.worker.register.ServiceNameService;
-import org.skywalking.apm.collector.agent.stream.worker.trace.TraceSegmentService;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.ModuleProvider;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.skywalking.apm.collector.remote.RemoteModule;
-import org.skywalking.apm.collector.remote.service.RemoteDataRegisterService;
-import org.skywalking.apm.collector.storage.StorageModule;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentStreamModuleProvider extends ModuleProvider {
-
- @Override public String name() {
- return "default";
- }
-
- @Override public Class module() {
- return AgentStreamModule.class;
- }
-
- @Override public void prepare(Properties config) throws ServiceNotProvidedException {
- this.registerServiceImplementation(IApplicationIDService.class, new ApplicationIDService(getManager()));
- this.registerServiceImplementation(IInstanceIDService.class, new InstanceIDService(getManager()));
- this.registerServiceImplementation(IServiceNameService.class, new ServiceNameService(getManager()));
-
- this.registerServiceImplementation(ICpuMetricService.class, new CpuMetricService());
- this.registerServiceImplementation(IGCMetricService.class, new GCMetricService());
- this.registerServiceImplementation(IMemoryMetricService.class, new MemoryMetricService());
- this.registerServiceImplementation(IMemoryPoolMetricService.class, new MemoryPoolMetricService());
- this.registerServiceImplementation(IInstanceHeartBeatService.class, new InstanceHeartBeatService());
-
- this.registerServiceImplementation(ITraceSegmentService.class, new TraceSegmentService(getManager()));
-
- BufferFileConfig.Parser parser = new BufferFileConfig.Parser();
- parser.parse(config);
- }
-
- @Override public void start(Properties config) throws ServiceNotProvidedException {
- RemoteDataRegisterService remoteDataRegisterService = getManager().find(RemoteModule.NAME).getService(RemoteDataRegisterService.class);
- AgentStreamRemoteDataRegister agentStreamRemoteDataRegister = new AgentStreamRemoteDataRegister(remoteDataRegisterService);
- agentStreamRemoteDataRegister.register();
-
- AgentStreamBootStartup bootStartup = new AgentStreamBootStartup(getManager());
- bootStartup.start();
- }
-
- @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
-
- }
-
- @Override public String[] requiredModules() {
- return new String[] {StorageModule.NAME, CacheModule.NAME};
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/IdAutoIncrement.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/IdAutoIncrement.java
deleted file mode 100644
index c2ce349ba410..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/IdAutoIncrement.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream;
-
-/**
- * @author peng-yongsheng
- */
-public enum IdAutoIncrement {
- INSTANCE;
-
- public int increment(int min, int max) {
- int instanceId;
- if (min == max) {
- instanceId = -1;
- } else if (min + max == 0) {
- instanceId = max + 1;
- } else if (min + max > 0) {
- instanceId = min - 1;
- } else if (max < 0) {
- instanceId = 1;
- } else {
- instanceId = max + 1;
- }
- return instanceId;
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/BufferFileConfig.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/BufferFileConfig.java
deleted file mode 100644
index 812048b72220..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/BufferFileConfig.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.buffer;
-
-import java.util.Properties;
-
-/**
- * @author peng-yongsheng
- */
-public class BufferFileConfig {
- static int BUFFER_OFFSET_MAX_FILE_SIZE = 10 * 1024 * 1024;
- static int BUFFER_SEGMENT_MAX_FILE_SIZE = 10 * 1024 * 1024;
- static String BUFFER_PATH = "../buffer/";
-
- private static final String BUFFER_PATH_KEY = "buffer_file_path";
- private static final String BUFFER_OFFSET_MAX_FILE_SIZE_KEY = "buffer_offset_max_file_size";
- private static final String BUFFER_SEGMENT_MAX_FILE_SIZE_KEY = "buffer_segment_max_file_size";
-
- public static class Parser {
-
- public void parse(Properties config) {
- if (config.containsKey(BUFFER_PATH_KEY)) {
- BUFFER_PATH = config.getProperty(BUFFER_PATH_KEY);
- }
-
- if (config.containsKey(BUFFER_OFFSET_MAX_FILE_SIZE_KEY)) {
- String sizeStr = config.getProperty(BUFFER_OFFSET_MAX_FILE_SIZE_KEY).toUpperCase();
- if (sizeStr.endsWith("K")) {
- int size = Integer.parseInt(sizeStr.replace("K", ""));
- BUFFER_OFFSET_MAX_FILE_SIZE = size * 1024;
- } else if (sizeStr.endsWith("KB")) {
- int size = Integer.parseInt(sizeStr.replace("KB", ""));
- BUFFER_OFFSET_MAX_FILE_SIZE = size * 1024;
- } else if (sizeStr.endsWith("M")) {
- int size = Integer.parseInt(sizeStr.replace("M", ""));
- BUFFER_OFFSET_MAX_FILE_SIZE = size * 1024 * 1024;
- } else if (sizeStr.endsWith("MB")) {
- int size = Integer.parseInt(sizeStr.replace("MB", ""));
- BUFFER_OFFSET_MAX_FILE_SIZE = size * 1024 * 1024;
- } else {
- BUFFER_OFFSET_MAX_FILE_SIZE = 10 * 1024 * 1024;
- }
- } else {
- BUFFER_OFFSET_MAX_FILE_SIZE = 10 * 1024 * 1024;
- }
-
- if (config.containsKey(BUFFER_SEGMENT_MAX_FILE_SIZE_KEY)) {
- String sizeStr = config.getProperty(BUFFER_SEGMENT_MAX_FILE_SIZE_KEY).toUpperCase();
- if (sizeStr.endsWith("K")) {
- int size = Integer.parseInt(sizeStr.replace("K", ""));
- BUFFER_SEGMENT_MAX_FILE_SIZE = size * 1024;
- } else if (sizeStr.endsWith("KB")) {
- int size = Integer.parseInt(sizeStr.replace("KB", ""));
- BUFFER_SEGMENT_MAX_FILE_SIZE = size * 1024;
- } else if (sizeStr.endsWith("M")) {
- int size = Integer.parseInt(sizeStr.replace("M", ""));
- BUFFER_SEGMENT_MAX_FILE_SIZE = size * 1024 * 1024;
- } else if (sizeStr.endsWith("MB")) {
- int size = Integer.parseInt(sizeStr.replace("MB", ""));
- BUFFER_SEGMENT_MAX_FILE_SIZE = size * 1024 * 1024;
- } else {
- BUFFER_SEGMENT_MAX_FILE_SIZE = 1024 * 1024;
- }
- } else {
- BUFFER_SEGMENT_MAX_FILE_SIZE = 1024 * 1024;
- }
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/Offset.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/Offset.java
deleted file mode 100644
index d2eba51edb98..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/Offset.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.buffer;
-
-/**
- * @author peng-yongsheng
- */
-public class Offset {
-
- private static final String SPLIT_CHARACTER = ",";
- private ReadOffset readOffset;
- private WriteOffset writeOffset;
-
- public Offset() {
- readOffset = new ReadOffset();
- writeOffset = new WriteOffset();
- }
-
- public String serialize() {
- return readOffset.getReadFileName() + SPLIT_CHARACTER + String.valueOf(readOffset.getReadFileOffset())
- + SPLIT_CHARACTER + writeOffset.getWriteFileName() + SPLIT_CHARACTER + String.valueOf(writeOffset.getWriteFileOffset());
- }
-
- public void deserialize(String value) {
- String[] values = value.split(SPLIT_CHARACTER);
- if (values.length == 4) {
- this.readOffset.readFileName = values[0];
- this.readOffset.readFileOffset = Long.parseLong(values[1]);
- this.writeOffset.writeFileName = values[2];
- this.writeOffset.writeFileOffset = Long.parseLong(values[3]);
- }
- }
-
- public ReadOffset getReadOffset() {
- return readOffset;
- }
-
- public WriteOffset getWriteOffset() {
- return writeOffset;
- }
-
- public static class ReadOffset {
- private String readFileName;
- private long readFileOffset = 0;
-
- public String getReadFileName() {
- return readFileName;
- }
-
- public long getReadFileOffset() {
- return readFileOffset;
- }
-
- public void setReadFileName(String readFileName) {
- this.readFileName = readFileName;
- }
-
- public void setReadFileOffset(long readFileOffset) {
- this.readFileOffset = readFileOffset;
- }
- }
-
- public static class WriteOffset {
- private String writeFileName;
- private long writeFileOffset = 0;
-
- public String getWriteFileName() {
- return writeFileName;
- }
-
- public long getWriteFileOffset() {
- return writeFileOffset;
- }
-
- public void setWriteFileName(String writeFileName) {
- this.writeFileName = writeFileName;
- }
-
- public void setWriteFileOffset(long writeFileOffset) {
- this.writeFileOffset = writeFileOffset;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/OffsetManager.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/OffsetManager.java
deleted file mode 100644
index a78aa1ac4470..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/OffsetManager.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.buffer;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import org.skywalking.apm.collector.agent.stream.util.FileUtils;
-import org.skywalking.apm.collector.core.util.CollectionUtils;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public enum OffsetManager {
- INSTANCE;
-
- private final Logger logger = LoggerFactory.getLogger(OffsetManager.class);
-
- private static final String OFFSET_FILE_PREFIX = "offset";
- private File offsetFile;
- private Offset offset;
- private boolean initialized = false;
- private RandomAccessFile randomAccessFile = null;
- private String lastOffsetRecord = Const.EMPTY_STRING;
-
- public synchronized void initialize() throws IOException {
- if (!initialized) {
- this.offset = new Offset();
- File dataPath = new File(BufferFileConfig.BUFFER_PATH);
- if (dataPath.mkdirs()) {
- createOffsetFile();
- } else {
- File[] offsetFiles = dataPath.listFiles(new PrefixFileNameFilter());
- if (CollectionUtils.isNotEmpty(offsetFiles) && offsetFiles.length > 0) {
- for (int i = 0; i < offsetFiles.length; i++) {
- if (i != offsetFiles.length - 1) {
- offsetFiles[i].delete();
- } else {
- offsetFile = offsetFiles[i];
- }
- }
- } else {
- createOffsetFile();
- }
- }
- String offsetRecord = FileUtils.INSTANCE.readLastLine(offsetFile);
- offset.deserialize(offsetRecord);
- initialized = true;
-
- Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(this::flush, 10, 3, TimeUnit.SECONDS);
- }
- }
-
- private void createOffsetFile() throws IOException {
- String timeBucket = String.valueOf(TimeBucketUtils.INSTANCE.getSecondTimeBucket(System.currentTimeMillis()));
- String offsetFileName = OFFSET_FILE_PREFIX + "_" + timeBucket + "." + Const.FILE_SUFFIX;
- offsetFile = new File(BufferFileConfig.BUFFER_PATH + offsetFileName);
- this.offset.getWriteOffset().setWriteFileName(Const.EMPTY_STRING);
- this.offset.getWriteOffset().setWriteFileOffset(0);
- this.offset.getReadOffset().setReadFileName(Const.EMPTY_STRING);
- this.offset.getReadOffset().setReadFileOffset(0);
- this.flush();
- }
-
- public void flush() {
- String offsetRecord = offset.serialize();
- if (!lastOffsetRecord.equals(offsetRecord)) {
- if (offsetFile.length() >= BufferFileConfig.BUFFER_OFFSET_MAX_FILE_SIZE) {
- nextFile();
- }
- FileUtils.INSTANCE.writeAppendToLast(offsetFile, randomAccessFile, offsetRecord);
- lastOffsetRecord = offsetRecord;
- }
- }
-
- private void nextFile() {
- String timeBucket = String.valueOf(TimeBucketUtils.INSTANCE.getSecondTimeBucket(System.currentTimeMillis()));
- String offsetFileName = OFFSET_FILE_PREFIX + "_" + timeBucket + "." + Const.FILE_SUFFIX;
- File newOffsetFile = new File(BufferFileConfig.BUFFER_PATH + offsetFileName);
- offsetFile.delete();
- offsetFile = newOffsetFile;
- this.flush();
- }
-
- public String getReadFileName() {
- return offset.getReadOffset().getReadFileName();
- }
-
- public long getReadFileOffset() {
- return offset.getReadOffset().getReadFileOffset();
- }
-
- public void setReadOffset(long readFileOffset) {
- offset.getReadOffset().setReadFileOffset(readFileOffset);
- }
-
- public void setReadOffset(String readFileName, long readFileOffset) {
- offset.getReadOffset().setReadFileName(readFileName);
- offset.getReadOffset().setReadFileOffset(readFileOffset);
- }
-
- public String getWriteFileName() {
- return offset.getWriteOffset().getWriteFileName();
- }
-
- public long getWriteFileOffset() {
- return offset.getWriteOffset().getWriteFileOffset();
- }
-
- public void setWriteOffset(String writeFileName, long writeFileOffset) {
- offset.getWriteOffset().setWriteFileName(writeFileName);
- offset.getWriteOffset().setWriteFileOffset(writeFileOffset);
- }
-
- public void setWriteOffset(long writeFileOffset) {
- offset.getWriteOffset().setWriteFileOffset(writeFileOffset);
- }
-
- class PrefixFileNameFilter implements FilenameFilter {
- @Override public boolean accept(File dir, String name) {
- return name.startsWith(OFFSET_FILE_PREFIX);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferManager.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferManager.java
deleted file mode 100644
index 2d3a87807eb1..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferManager.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.buffer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.StringUtils;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public enum SegmentBufferManager {
- INSTANCE;
-
- private final Logger logger = LoggerFactory.getLogger(SegmentBufferManager.class);
-
- public static final String DATA_FILE_PREFIX = "data";
- private FileOutputStream outputStream;
-
- public synchronized void initialize(ModuleManager moduleManager) {
- logger.info("segment buffer initialize");
- try {
- OffsetManager.INSTANCE.initialize();
- if (new File(BufferFileConfig.BUFFER_PATH).mkdirs()) {
- newDataFile();
- } else {
- String writeFileName = OffsetManager.INSTANCE.getWriteFileName();
- if (StringUtils.isNotEmpty(writeFileName)) {
- File dataFile = new File(BufferFileConfig.BUFFER_PATH + writeFileName);
- if (dataFile.exists()) {
- outputStream = new FileOutputStream(new File(BufferFileConfig.BUFFER_PATH + writeFileName), true);
- } else {
- newDataFile();
- }
- } else {
- newDataFile();
- }
- }
- SegmentBufferReader.INSTANCE.initialize(moduleManager);
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- public synchronized void writeBuffer(UpstreamSegment segment) {
- try {
- segment.writeDelimitedTo(outputStream);
- long position = outputStream.getChannel().position();
- if (position > BufferFileConfig.BUFFER_SEGMENT_MAX_FILE_SIZE) {
- newDataFile();
- } else {
- OffsetManager.INSTANCE.setWriteOffset(position);
- }
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- private void newDataFile() throws IOException {
- logger.debug("create new segment buffer file");
- String timeBucket = String.valueOf(TimeBucketUtils.INSTANCE.getSecondTimeBucket(System.currentTimeMillis()));
- String writeFileName = DATA_FILE_PREFIX + "_" + timeBucket + "." + Const.FILE_SUFFIX;
- File dataFile = new File(BufferFileConfig.BUFFER_PATH + writeFileName);
- dataFile.createNewFile();
- OffsetManager.INSTANCE.setWriteOffset(writeFileName, 0);
- try {
- if (outputStream != null) {
- outputStream.close();
- }
- outputStream = new FileOutputStream(dataFile);
- outputStream.getChannel().position(0);
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- public synchronized void flush() {
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferReader.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferReader.java
deleted file mode 100644
index 0126686cbee9..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/buffer/SegmentBufferReader.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.buffer;
-
-import com.google.protobuf.CodedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import org.skywalking.apm.collector.agent.stream.parser.SegmentParse;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.CollectionUtils;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.StringUtils;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public enum SegmentBufferReader {
- INSTANCE;
-
- private final Logger logger = LoggerFactory.getLogger(SegmentBufferReader.class);
- private InputStream inputStream;
- private ModuleManager moduleManager;
-
- public void initialize(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(this::preRead, 3, 3, TimeUnit.SECONDS);
- }
-
- private void preRead() {
- String readFileName = OffsetManager.INSTANCE.getReadFileName();
- if (StringUtils.isNotEmpty(readFileName)) {
- File readFile = new File(BufferFileConfig.BUFFER_PATH + readFileName);
- if (readFile.exists()) {
- deleteTheDataFilesBeforeReadFile(readFileName);
- long readFileOffset = OffsetManager.INSTANCE.getReadFileOffset();
- read(readFile, readFileOffset);
- readEarliestCreateDataFile();
- } else {
- deleteTheDataFilesBeforeReadFile(readFileName);
- readEarliestCreateDataFile();
- }
- } else {
- readEarliestCreateDataFile();
- }
- }
-
- private void deleteTheDataFilesBeforeReadFile(String readFileName) {
- File[] dataFiles = new File(BufferFileConfig.BUFFER_PATH).listFiles(new PrefixFileNameFilter());
-
- long readFileCreateTime = getFileCreateTime(readFileName);
- for (File dataFile : dataFiles) {
- long fileCreateTime = getFileCreateTime(dataFile.getName());
- if (fileCreateTime < readFileCreateTime) {
- dataFile.delete();
- } else if (fileCreateTime == readFileCreateTime) {
- break;
- }
- }
- }
-
- private long getFileCreateTime(String fileName) {
- fileName = fileName.replace(SegmentBufferManager.DATA_FILE_PREFIX + "_", Const.EMPTY_STRING);
- fileName = fileName.replace("." + Const.FILE_SUFFIX, Const.EMPTY_STRING);
- return Long.valueOf(fileName);
- }
-
- private void readEarliestCreateDataFile() {
- String readFileName = OffsetManager.INSTANCE.getReadFileName();
- File[] dataFiles = new File(BufferFileConfig.BUFFER_PATH).listFiles(new PrefixFileNameFilter());
-
- if (CollectionUtils.isNotEmpty(dataFiles)) {
- if (dataFiles[0].getName().equals(readFileName)) {
- return;
- }
- }
-
- for (File dataFile : dataFiles) {
- logger.debug("Reading segment buffer data file, file name: {}", dataFile.getAbsolutePath());
- OffsetManager.INSTANCE.setReadOffset(dataFile.getName(), 0);
- if (!read(dataFile, 0)) {
- break;
- }
- }
- }
-
- private boolean read(File readFile, long readFileOffset) {
- try {
- inputStream = new FileInputStream(readFile);
- inputStream.skip(readFileOffset);
-
- String writeFileName = OffsetManager.INSTANCE.getWriteFileName();
- long endPoint = readFile.length();
- if (writeFileName.equals(readFile.getName())) {
- endPoint = OffsetManager.INSTANCE.getWriteFileOffset();
- }
-
- while (readFile.length() > readFileOffset && readFileOffset < endPoint) {
- UpstreamSegment upstreamSegment = UpstreamSegment.parser().parseDelimitedFrom(inputStream);
- SegmentParse parse = new SegmentParse(moduleManager);
- if (!parse.parse(upstreamSegment, SegmentParse.Source.Buffer)) {
- return false;
- }
-
- final int serialized = upstreamSegment.getSerializedSize();
- readFileOffset = readFileOffset + CodedOutputStream.computeUInt32SizeNoTag(serialized) + serialized;
- logger.debug("read segment buffer from file: {}, offset: {}, file length: {}", readFile.getName(), readFileOffset, readFile.length());
- OffsetManager.INSTANCE.setReadOffset(readFileOffset);
- }
-
- inputStream.close();
- if (!writeFileName.equals(readFile.getName())) {
- readFile.delete();
- }
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- return false;
- }
- return true;
- }
-
- class PrefixFileNameFilter implements FilenameFilter {
- @Override public boolean accept(File dir, String name) {
- return name.startsWith(SegmentBufferManager.DATA_FILE_PREFIX);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java
deleted file mode 100644
index 355b17c8672f..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/JvmMetricStreamGraph.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.graph;
-
-import org.skywalking.apm.collector.agent.stream.worker.jvm.CpuMetricPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.GCMetricPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.InstHeartBeatPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.MemoryMetricPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.jvm.MemoryPoolMetricPersistenceWorker;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.QueueModule;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.table.jvm.CpuMetric;
-import org.skywalking.apm.collector.storage.table.jvm.GCMetric;
-import org.skywalking.apm.collector.storage.table.jvm.MemoryMetric;
-import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric;
-import org.skywalking.apm.collector.storage.table.register.Instance;
-import org.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;
-
-/**
- * @author peng-yongsheng
- */
-public class JvmMetricStreamGraph {
-
- public static final int GC_METRIC_GRAPH_ID = 100;
- public static final int MEMORY_METRIC_GRAPH_ID = 101;
- public static final int MEMORY_POOL_METRIC_GRAPH_ID = 102;
- public static final int CPU_METRIC_GRAPH_ID = 103;
- public static final int INST_HEART_BEAT_GRAPH_ID = 104;
-
- private final ModuleManager moduleManager;
- private final WorkerCreateListener workerCreateListener;
-
- public JvmMetricStreamGraph(ModuleManager moduleManager, WorkerCreateListener workerCreateListener) {
- this.moduleManager = moduleManager;
- this.workerCreateListener = workerCreateListener;
- }
-
- @SuppressWarnings("unchecked")
- public void createGcMetricGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(GC_METRIC_GRAPH_ID, GCMetric.class);
- graph.addNode(new GCMetricPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createCpuMetricGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(CPU_METRIC_GRAPH_ID, CpuMetric.class);
- graph.addNode(new CpuMetricPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createMemoryMetricGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(MEMORY_METRIC_GRAPH_ID, MemoryMetric.class);
- graph.addNode(new MemoryMetricPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createMemoryPoolMetricGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(MEMORY_POOL_METRIC_GRAPH_ID, MemoryPoolMetric.class);
- graph.addNode(new MemoryPoolMetricPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createHeartBeatGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(INST_HEART_BEAT_GRAPH_ID, Instance.class);
- graph.addNode(new InstHeartBeatPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/RegisterStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/RegisterStreamGraph.java
deleted file mode 100644
index 9e5d7af08103..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/RegisterStreamGraph.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.graph;
-
-import org.skywalking.apm.collector.agent.stream.worker.register.ApplicationRegisterRemoteWorker;
-import org.skywalking.apm.collector.agent.stream.worker.register.ApplicationRegisterSerialWorker;
-import org.skywalking.apm.collector.agent.stream.worker.register.InstanceRegisterRemoteWorker;
-import org.skywalking.apm.collector.agent.stream.worker.register.InstanceRegisterSerialWorker;
-import org.skywalking.apm.collector.agent.stream.worker.register.ServiceNameRegisterRemoteWorker;
-import org.skywalking.apm.collector.agent.stream.worker.register.ServiceNameRegisterSerialWorker;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.QueueModule;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.remote.RemoteModule;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.storage.table.register.Application;
-import org.skywalking.apm.collector.storage.table.register.Instance;
-import org.skywalking.apm.collector.storage.table.register.ServiceName;
-import org.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;
-
-/**
- * @author peng-yongsheng
- */
-public class RegisterStreamGraph {
-
- public static final int APPLICATION_REGISTER_GRAPH_ID = 200;
- public static final int INSTANCE_REGISTER_GRAPH_ID = 201;
- public static final int SERVICE_NAME_REGISTER_GRAPH_ID = 202;
-
- private final ModuleManager moduleManager;
- private final WorkerCreateListener workerCreateListener;
-
- public RegisterStreamGraph(ModuleManager moduleManager, WorkerCreateListener workerCreateListener) {
- this.moduleManager = moduleManager;
- this.workerCreateListener = workerCreateListener;
- }
-
- @SuppressWarnings("unchecked")
- public void createApplicationRegisterGraph() {
- RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
-
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(APPLICATION_REGISTER_GRAPH_ID, Application.class);
- graph.addNode(new ApplicationRegisterRemoteWorker.Factory(moduleManager, remoteSenderService, APPLICATION_REGISTER_GRAPH_ID).create(workerCreateListener))
- .addNext(new ApplicationRegisterSerialWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createInstanceRegisterGraph() {
- RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
-
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(INSTANCE_REGISTER_GRAPH_ID, Instance.class);
- graph.addNode(new InstanceRegisterRemoteWorker.Factory(moduleManager, remoteSenderService, INSTANCE_REGISTER_GRAPH_ID).create(workerCreateListener))
- .addNext(new InstanceRegisterSerialWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createServiceNameRegisterGraph() {
- RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
-
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(SERVICE_NAME_REGISTER_GRAPH_ID, ServiceName.class);
- graph.addNode(new ServiceNameRegisterRemoteWorker.Factory(moduleManager, remoteSenderService, SERVICE_NAME_REGISTER_GRAPH_ID).create(workerCreateListener))
- .addNext(new ServiceNameRegisterSerialWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java
deleted file mode 100644
index 49cb88d5b97e..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.graph;
-
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SegmentStandardization;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SegmentStandardizationWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.global.GlobalTracePersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstPerformancePersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.node.NodeComponentAggregationWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.node.NodeComponentPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.node.NodeComponentRemoteWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.node.NodeMappingAggregationWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.node.NodeMappingPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.node.NodeMappingRemoteWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.noderef.NodeReferenceAggregationWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.noderef.NodeReferencePersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.noderef.NodeReferenceRemoteWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.segment.SegmentCostPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.segment.SegmentPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceEntryAggregationWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceEntryPersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceEntryRemoteWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.serviceref.ServiceReferenceAggregationWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.serviceref.ServiceReferencePersistenceWorker;
-import org.skywalking.apm.collector.agent.stream.worker.trace.serviceref.ServiceReferenceRemoteWorker;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.QueueModule;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.remote.RemoteModule;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.storage.table.global.GlobalTrace;
-import org.skywalking.apm.collector.storage.table.instance.InstPerformance;
-import org.skywalking.apm.collector.storage.table.node.NodeComponent;
-import org.skywalking.apm.collector.storage.table.node.NodeMapping;
-import org.skywalking.apm.collector.storage.table.noderef.NodeReference;
-import org.skywalking.apm.collector.storage.table.segment.Segment;
-import org.skywalking.apm.collector.storage.table.segment.SegmentCost;
-import org.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.skywalking.apm.collector.storage.table.serviceref.ServiceReference;
-import org.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;
-
-/**
- * @author peng-yongsheng
- */
-public class TraceStreamGraph {
-
- public static final int GLOBAL_TRACE_GRAPH_ID = 300;
- public static final int INST_PERFORMANCE_GRAPH_ID = 301;
- public static final int NODE_COMPONENT_GRAPH_ID = 302;
- public static final int NODE_MAPPING_GRAPH_ID = 303;
- public static final int NODE_REFERENCE_GRAPH_ID = 304;
- public static final int SERVICE_ENTRY_GRAPH_ID = 305;
- public static final int SERVICE_REFERENCE_GRAPH_ID = 306;
- public static final int SEGMENT_GRAPH_ID = 307;
- public static final int SEGMENT_COST_GRAPH_ID = 308;
- public static final int SEGMENT_STANDARDIZATION_GRAPH_ID = 309;
-
- private final ModuleManager moduleManager;
- private final WorkerCreateListener workerCreateListener;
-
- public TraceStreamGraph(ModuleManager moduleManager, WorkerCreateListener workerCreateListener) {
- this.moduleManager = moduleManager;
- this.workerCreateListener = workerCreateListener;
- }
-
- @SuppressWarnings("unchecked")
- public void createSegmentStandardizationGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(SEGMENT_STANDARDIZATION_GRAPH_ID, SegmentStandardization.class);
- graph.addNode(new SegmentStandardizationWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createGlobalTraceGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(GLOBAL_TRACE_GRAPH_ID, GlobalTrace.class);
- graph.addNode(new GlobalTracePersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createInstPerformanceGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(INST_PERFORMANCE_GRAPH_ID, InstPerformance.class);
- graph.addNode(new InstPerformancePersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createNodeComponentGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
- RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(NODE_COMPONENT_GRAPH_ID, NodeComponent.class);
- graph.addNode(new NodeComponentAggregationWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener))
- .addNext(new NodeComponentRemoteWorker.Factory(moduleManager, remoteSenderService, NODE_COMPONENT_GRAPH_ID).create(workerCreateListener))
- .addNext(new NodeComponentPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createNodeMappingGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
- RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(NODE_MAPPING_GRAPH_ID, NodeMapping.class);
- graph.addNode(new NodeMappingAggregationWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener))
- .addNext(new NodeMappingRemoteWorker.Factory(moduleManager, remoteSenderService, NODE_MAPPING_GRAPH_ID).create(workerCreateListener))
- .addNext(new NodeMappingPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createNodeReferenceGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
- RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(NODE_REFERENCE_GRAPH_ID, NodeReference.class);
- graph.addNode(new NodeReferenceAggregationWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener))
- .addNext(new NodeReferenceRemoteWorker.Factory(moduleManager, remoteSenderService, NODE_REFERENCE_GRAPH_ID).create(workerCreateListener))
- .addNext(new NodeReferencePersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createServiceEntryGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
- RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(SERVICE_ENTRY_GRAPH_ID, ServiceEntry.class);
- graph.addNode(new ServiceEntryAggregationWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener))
- .addNext(new ServiceEntryRemoteWorker.Factory(moduleManager, remoteSenderService, SERVICE_ENTRY_GRAPH_ID).create(workerCreateListener))
- .addNext(new ServiceEntryPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createServiceReferenceGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
- RemoteSenderService remoteSenderService = moduleManager.find(RemoteModule.NAME).getService(RemoteSenderService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(SERVICE_REFERENCE_GRAPH_ID, ServiceReference.class);
- graph.addNode(new ServiceReferenceAggregationWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener))
- .addNext(new ServiceReferenceRemoteWorker.Factory(moduleManager, remoteSenderService, SERVICE_REFERENCE_GRAPH_ID).create(workerCreateListener))
- .addNext(new ServiceReferencePersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createSegmentGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(SEGMENT_GRAPH_ID, Segment.class);
- graph.addNode(new SegmentPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-
- @SuppressWarnings("unchecked")
- public void createSegmentCostGraph() {
- QueueCreatorService queueCreatorService = moduleManager.find(QueueModule.NAME).getService(QueueCreatorService.class);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(SEGMENT_COST_GRAPH_ID, SegmentCost.class);
- graph.addNode(new SegmentCostPersistenceWorker.Factory(moduleManager, queueCreatorService).create(workerCreateListener));
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/EntrySpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/EntrySpanListener.java
deleted file mode 100644
index 35aac1001491..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/EntrySpanListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser;
-
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-
-/**
- * @author peng-yongsheng
- */
-public interface EntrySpanListener extends SpanListener {
- void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/ExitSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/ExitSpanListener.java
deleted file mode 100644
index 23c939fec96b..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/ExitSpanListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser;
-
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-
-/**
- * @author peng-yongsheng
- */
-public interface ExitSpanListener extends SpanListener {
- void parseExit(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/FirstSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/FirstSpanListener.java
deleted file mode 100644
index ea774a98b87a..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/FirstSpanListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser;
-
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-
-/**
- * @author peng-yongsheng
- */
-public interface FirstSpanListener extends SpanListener {
- void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/GlobalTraceIdsListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/GlobalTraceIdsListener.java
deleted file mode 100644
index 25f7837ff006..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/GlobalTraceIdsListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser;
-
-import org.skywalking.apm.network.proto.UniqueId;
-
-/**
- * @author peng-yongsheng
- */
-public interface GlobalTraceIdsListener extends SpanListener {
- void parseGlobalTraceId(UniqueId uniqueId);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/LocalSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/LocalSpanListener.java
deleted file mode 100644
index 07fe5eeb1a26..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/LocalSpanListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser;
-
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-
-/**
- * @author peng-yongsheng
- */
-public interface LocalSpanListener extends SpanListener {
- void parseLocal(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/RefsListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/RefsListener.java
deleted file mode 100644
index d12db455f657..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/RefsListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser;
-
-import org.skywalking.apm.collector.agent.stream.parser.standardization.ReferenceDecorator;
-
-/**
- * @author peng-yongsheng
- */
-public interface RefsListener extends SpanListener {
- void parseRef(ReferenceDecorator referenceDecorator, int applicationId, int instanceId, String segmentId);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SegmentParse.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SegmentParse.java
deleted file mode 100644
index 97d518eb00da..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SegmentParse.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser;
-
-import com.google.protobuf.InvalidProtocolBufferException;
-import java.util.ArrayList;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.ReferenceDecorator;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.ReferenceIdExchanger;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SegmentDecorator;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SegmentStandardization;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanIdExchanger;
-import org.skywalking.apm.collector.agent.stream.worker.trace.global.GlobalTraceSpanListener;
-import org.skywalking.apm.collector.agent.stream.worker.trace.instance.InstPerformanceSpanListener;
-import org.skywalking.apm.collector.agent.stream.worker.trace.node.NodeComponentSpanListener;
-import org.skywalking.apm.collector.agent.stream.worker.trace.node.NodeMappingSpanListener;
-import org.skywalking.apm.collector.agent.stream.worker.trace.noderef.NodeReferenceSpanListener;
-import org.skywalking.apm.collector.agent.stream.worker.trace.segment.SegmentCostSpanListener;
-import org.skywalking.apm.collector.agent.stream.worker.trace.service.ServiceEntrySpanListener;
-import org.skywalking.apm.collector.agent.stream.worker.trace.serviceref.ServiceReferenceSpanListener;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.segment.Segment;
-import org.skywalking.apm.network.proto.SpanType;
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-import org.skywalking.apm.network.proto.UniqueId;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentParse {
-
- private final Logger logger = LoggerFactory.getLogger(SegmentParse.class);
-
- private final List spanListeners;
- private final ModuleManager moduleManager;
- private String segmentId;
- private long timeBucket = 0;
-
- public SegmentParse(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- this.spanListeners = new ArrayList<>();
- this.spanListeners.add(new NodeComponentSpanListener());
- this.spanListeners.add(new NodeMappingSpanListener());
- this.spanListeners.add(new NodeReferenceSpanListener(moduleManager));
- this.spanListeners.add(new SegmentCostSpanListener(moduleManager));
- this.spanListeners.add(new GlobalTraceSpanListener());
- this.spanListeners.add(new ServiceEntrySpanListener(moduleManager));
- this.spanListeners.add(new ServiceReferenceSpanListener());
- this.spanListeners.add(new InstPerformanceSpanListener());
- }
-
- public boolean parse(UpstreamSegment segment, Source source) {
- try {
- List traceIds = segment.getGlobalTraceIdsList();
- TraceSegmentObject segmentObject = TraceSegmentObject.parseFrom(segment.getSegment());
-
- SegmentDecorator segmentDecorator = new SegmentDecorator(segmentObject);
-
- if (!preBuild(traceIds, segmentDecorator)) {
- logger.debug("This segment id exchange not success, write to buffer file, id: {}", segmentId);
-
- if (source.equals(Source.Agent)) {
- writeToBufferFile(segmentId, segment);
- }
- return false;
- } else {
- logger.debug("This segment id exchange success, id: {}", segmentId);
- notifyListenerToBuild();
- buildSegment(segmentId, segmentDecorator.toByteArray());
- return true;
- }
- } catch (InvalidProtocolBufferException e) {
- logger.error(e.getMessage(), e);
- }
- return false;
- }
-
- private boolean preBuild(List traceIds, SegmentDecorator segmentDecorator) {
- StringBuilder segmentIdBuilder = new StringBuilder();
-
- for (int i = 0; i < segmentDecorator.getTraceSegmentId().getIdPartsList().size(); i++) {
- if (i == 0) {
- segmentIdBuilder.append(segmentDecorator.getTraceSegmentId().getIdPartsList().get(i));
- } else {
- segmentIdBuilder.append(".").append(segmentDecorator.getTraceSegmentId().getIdPartsList().get(i));
- }
- }
-
- segmentId = segmentIdBuilder.toString();
-
- for (UniqueId uniqueId : traceIds) {
- notifyGlobalsListener(uniqueId);
- }
-
- int applicationId = segmentDecorator.getApplicationId();
- int applicationInstanceId = segmentDecorator.getApplicationInstanceId();
-
- for (int i = 0; i < segmentDecorator.getRefsCount(); i++) {
- ReferenceDecorator referenceDecorator = segmentDecorator.getRefs(i);
- if (!ReferenceIdExchanger.getInstance(moduleManager).exchange(referenceDecorator, applicationId)) {
- return false;
- }
-
- notifyRefsListener(referenceDecorator, applicationId, applicationInstanceId, segmentId);
- }
-
- for (int i = 0; i < segmentDecorator.getSpansCount(); i++) {
- SpanDecorator spanDecorator = segmentDecorator.getSpans(i);
-
- if (!SpanIdExchanger.getInstance(moduleManager).exchange(spanDecorator, applicationId)) {
- return false;
- }
-
- if (spanDecorator.getSpanId() == 0) {
- notifyFirstListener(spanDecorator, applicationId, applicationInstanceId, segmentId);
- timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
- }
-
- if (SpanType.Exit.equals(spanDecorator.getSpanType())) {
- notifyExitListener(spanDecorator, applicationId, applicationInstanceId, segmentId);
- } else if (SpanType.Entry.equals(spanDecorator.getSpanType())) {
- notifyEntryListener(spanDecorator, applicationId, applicationInstanceId, segmentId);
- } else if (SpanType.Local.equals(spanDecorator.getSpanType())) {
- notifyLocalListener(spanDecorator, applicationId, applicationInstanceId, segmentId);
- } else {
- logger.error("span type value was unexpected, span type name: {}", spanDecorator.getSpanType().name());
- }
- }
-
- return true;
- }
-
- private void buildSegment(String id, byte[] dataBinary) {
- Segment segment = new Segment(id);
- segment.setDataBinary(dataBinary);
- segment.setTimeBucket(timeBucket);
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.SEGMENT_GRAPH_ID, Segment.class);
- graph.start(segment);
- }
-
- private void writeToBufferFile(String id, UpstreamSegment upstreamSegment) {
- logger.debug("push to segment buffer write worker, id: {}", id);
- SegmentStandardization standardization = new SegmentStandardization(id);
- standardization.setUpstreamSegment(upstreamSegment);
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.SEGMENT_STANDARDIZATION_GRAPH_ID, SegmentStandardization.class);
- graph.start(standardization);
- }
-
- private void notifyListenerToBuild() {
- spanListeners.forEach(SpanListener::build);
- }
-
- private void notifyExitListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId,
- String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof ExitSpanListener) {
- ((ExitSpanListener)listener).parseExit(spanDecorator, applicationId, applicationInstanceId, segmentId);
- }
- }
- }
-
- private void notifyEntryListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId,
- String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof EntrySpanListener) {
- ((EntrySpanListener)listener).parseEntry(spanDecorator, applicationId, applicationInstanceId, segmentId);
- }
- }
- }
-
- private void notifyLocalListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId,
- String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof LocalSpanListener) {
- ((LocalSpanListener)listener).parseLocal(spanDecorator, applicationId, applicationInstanceId, segmentId);
- }
- }
- }
-
- private void notifyFirstListener(SpanDecorator spanDecorator, int applicationId, int applicationInstanceId,
- String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof FirstSpanListener) {
- ((FirstSpanListener)listener).parseFirst(spanDecorator, applicationId, applicationInstanceId, segmentId);
- }
- }
- }
-
- private void notifyRefsListener(ReferenceDecorator reference, int applicationId, int applicationInstanceId,
- String segmentId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof RefsListener) {
- ((RefsListener)listener).parseRef(reference, applicationId, applicationInstanceId, segmentId);
- }
- }
- }
-
- private void notifyGlobalsListener(UniqueId uniqueId) {
- for (SpanListener listener : spanListeners) {
- if (listener instanceof GlobalTraceIdsListener) {
- ((GlobalTraceIdsListener)listener).parseGlobalTraceId(uniqueId);
- }
- }
- }
-
- public enum Source {
- Agent, Buffer
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SpanListener.java
deleted file mode 100644
index e2885e9908fc..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/SpanListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser;
-
-/**
- * @author peng-yongsheng
- */
-public interface SpanListener {
- void build();
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/IdExchanger.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/IdExchanger.java
deleted file mode 100644
index 5b36854fc33e..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/IdExchanger.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-/**
- * @author peng-yongsheng
- */
-public interface IdExchanger {
- boolean exchange(T standardBuilder, int applicationId);
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/ReferenceDecorator.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/ReferenceDecorator.java
deleted file mode 100644
index 796dd6d55286..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/ReferenceDecorator.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-import org.skywalking.apm.network.proto.RefType;
-import org.skywalking.apm.network.proto.TraceSegmentReference;
-import org.skywalking.apm.network.proto.UniqueId;
-
-/**
- * @author peng-yongsheng
- */
-public class ReferenceDecorator implements StandardBuilder {
- private boolean isOrigin = true;
- private StandardBuilder standardBuilder;
- private TraceSegmentReference referenceObject;
- private TraceSegmentReference.Builder referenceBuilder;
-
- public ReferenceDecorator(TraceSegmentReference referenceObject, StandardBuilder standardBuilder) {
- this.referenceObject = referenceObject;
- this.standardBuilder = standardBuilder;
- }
-
- public ReferenceDecorator(TraceSegmentReference.Builder referenceBuilder, StandardBuilder standardBuilder) {
- this.referenceBuilder = referenceBuilder;
- this.standardBuilder = standardBuilder;
- this.isOrigin = false;
- }
-
- public RefType getRefType() {
- if (isOrigin) {
- return referenceObject.getRefType();
- } else {
- return referenceBuilder.getRefType();
- }
- }
-
- public int getRefTypeValue() {
- if (isOrigin) {
- return referenceObject.getRefTypeValue();
- } else {
- return referenceBuilder.getRefTypeValue();
- }
- }
-
- public int getEntryServiceId() {
- if (isOrigin) {
- return referenceObject.getEntryServiceId();
- } else {
- return referenceBuilder.getEntryServiceId();
- }
- }
-
- public void setEntryServiceId(int value) {
- if (isOrigin) {
- toBuilder();
- }
- referenceBuilder.setEntryServiceId(value);
- }
-
- public String getEntryServiceName() {
- if (isOrigin) {
- return referenceObject.getEntryServiceName();
- } else {
- return referenceBuilder.getEntryServiceName();
- }
- }
-
- public void setEntryServiceName(String value) {
- if (isOrigin) {
- toBuilder();
- }
- referenceBuilder.setEntryServiceName(value);
- }
-
- public int getEntryApplicationInstanceId() {
- if (isOrigin) {
- return referenceObject.getEntryApplicationInstanceId();
- } else {
- return referenceBuilder.getEntryApplicationInstanceId();
- }
- }
-
- public int getParentApplicationInstanceId() {
- if (isOrigin) {
- return referenceObject.getParentApplicationInstanceId();
- } else {
- return referenceBuilder.getParentApplicationInstanceId();
- }
- }
-
- public int getParentServiceId() {
- if (isOrigin) {
- return referenceObject.getParentServiceId();
- } else {
- return referenceBuilder.getParentServiceId();
- }
- }
-
- public void setParentServiceId(int value) {
- if (isOrigin) {
- toBuilder();
- }
- referenceBuilder.setParentServiceId(value);
- }
-
- public int getParentSpanId() {
- if (isOrigin) {
- return referenceObject.getParentSpanId();
- } else {
- return referenceBuilder.getParentSpanId();
- }
- }
-
- public String getParentServiceName() {
- if (isOrigin) {
- return referenceObject.getParentServiceName();
- } else {
- return referenceBuilder.getParentServiceName();
- }
- }
-
- public void setParentServiceName(String value) {
- if (isOrigin) {
- toBuilder();
- }
- referenceBuilder.setParentServiceName(value);
- }
-
- public UniqueId getParentTraceSegmentId() {
- if (isOrigin) {
- return referenceObject.getParentTraceSegmentId();
- } else {
- return referenceBuilder.getParentTraceSegmentId();
- }
- }
-
- public int getNetworkAddressId() {
- if (isOrigin) {
- return referenceObject.getNetworkAddressId();
- } else {
- return referenceBuilder.getNetworkAddressId();
- }
- }
-
- public void setNetworkAddressId(int value) {
- if (isOrigin) {
- toBuilder();
- }
- referenceBuilder.setNetworkAddressId(value);
- }
-
- public String getNetworkAddress() {
- if (isOrigin) {
- return referenceObject.getNetworkAddress();
- } else {
- return referenceBuilder.getNetworkAddress();
- }
- }
-
- public void setNetworkAddress(String value) {
- if (isOrigin) {
- toBuilder();
- }
- referenceBuilder.setNetworkAddress(value);
- }
-
- @Override public void toBuilder() {
- if (this.isOrigin) {
- this.isOrigin = false;
- referenceBuilder = referenceObject.toBuilder();
- standardBuilder.toBuilder();
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/ReferenceIdExchanger.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/ReferenceIdExchanger.java
deleted file mode 100644
index e0ea1401a51f..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/ReferenceIdExchanger.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-import org.skywalking.apm.collector.agent.stream.worker.register.ApplicationIDService;
-import org.skywalking.apm.collector.agent.stream.worker.register.ServiceNameService;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.InstanceCacheService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ReferenceIdExchanger implements IdExchanger {
-
- private final Logger logger = LoggerFactory.getLogger(ReferenceIdExchanger.class);
-
- private static ReferenceIdExchanger EXCHANGER;
- private final ServiceNameService serviceNameService;
- private final ApplicationIDService applicationIDService;
- private final InstanceCacheService instanceCacheService;
-
- public static ReferenceIdExchanger getInstance(ModuleManager moduleManager) {
- if (EXCHANGER == null) {
- EXCHANGER = new ReferenceIdExchanger(moduleManager);
- }
- return EXCHANGER;
- }
-
- private ReferenceIdExchanger(ModuleManager moduleManager) {
- applicationIDService = new ApplicationIDService(moduleManager);
- serviceNameService = new ServiceNameService(moduleManager);
- instanceCacheService = moduleManager.find(CacheModule.NAME).getService(InstanceCacheService.class);
- }
-
- @Override public boolean exchange(ReferenceDecorator standardBuilder, int applicationId) {
- if (standardBuilder.getEntryServiceId() == 0 && StringUtils.isNotEmpty(standardBuilder.getEntryServiceName())) {
- int entryServiceId = serviceNameService.getOrCreate(instanceCacheService.get(standardBuilder.getEntryApplicationInstanceId()), standardBuilder.getEntryServiceName());
-
- if (entryServiceId == 0) {
- if (logger.isDebugEnabled()) {
- int entryApplicationId = instanceCacheService.get(standardBuilder.getEntryApplicationInstanceId());
- logger.debug("entry service name: {} from application id: {} exchange failed", standardBuilder.getEntryServiceName(), entryApplicationId);
- }
- return false;
- } else {
- standardBuilder.toBuilder();
- standardBuilder.setEntryServiceId(entryServiceId);
- standardBuilder.setEntryServiceName(Const.EMPTY_STRING);
- }
- }
-
- if (standardBuilder.getParentServiceId() == 0 && StringUtils.isNotEmpty(standardBuilder.getParentServiceName())) {
- int parentServiceId = serviceNameService.getOrCreate(instanceCacheService.get(standardBuilder.getParentApplicationInstanceId()), standardBuilder.getParentServiceName());
-
- if (parentServiceId == 0) {
- if (logger.isDebugEnabled()) {
- int parentApplicationId = instanceCacheService.get(standardBuilder.getParentApplicationInstanceId());
- logger.debug("parent service name: {} from application id: {} exchange failed", standardBuilder.getParentServiceName(), parentApplicationId);
- }
- return false;
- } else {
- standardBuilder.toBuilder();
- standardBuilder.setParentServiceId(parentServiceId);
- standardBuilder.setParentServiceName(Const.EMPTY_STRING);
- }
- }
-
- if (standardBuilder.getNetworkAddressId() == 0 && StringUtils.isNotEmpty(standardBuilder.getNetworkAddress())) {
- int networkAddressId = applicationIDService.getOrCreate(standardBuilder.getNetworkAddress());
- if (networkAddressId == 0) {
- if (logger.isDebugEnabled()) {
- logger.debug("network address: {} from application id: {} exchange failed", standardBuilder.getNetworkAddress(), applicationId);
- }
- return false;
- } else {
- standardBuilder.toBuilder();
- standardBuilder.setNetworkAddressId(networkAddressId);
- standardBuilder.setNetworkAddress(Const.EMPTY_STRING);
- }
- }
- return true;
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentDecorator.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentDecorator.java
deleted file mode 100644
index 0d29ee479cbc..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentDecorator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-import org.skywalking.apm.network.proto.TraceSegmentObject;
-import org.skywalking.apm.network.proto.UniqueId;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentDecorator implements StandardBuilder {
- private boolean isOrigin = true;
- private final TraceSegmentObject segmentObject;
- private TraceSegmentObject.Builder segmentBuilder;
-
- public SegmentDecorator(TraceSegmentObject segmentObject) {
- this.segmentObject = segmentObject;
- }
-
- public int getApplicationId() {
- return segmentObject.getApplicationId();
- }
-
- public int getApplicationInstanceId() {
- return segmentObject.getApplicationInstanceId();
- }
-
- public UniqueId getTraceSegmentId() {
- return segmentObject.getTraceSegmentId();
- }
-
- public int getSpansCount() {
- return segmentObject.getSpansCount();
- }
-
- public SpanDecorator getSpans(int index) {
- if (isOrigin) {
- return new SpanDecorator(segmentObject.getSpans(index), this);
- } else {
- return new SpanDecorator(segmentBuilder.getSpansBuilder(index), this);
- }
- }
-
- public int getRefsCount() {
- return segmentObject.getRefsCount();
- }
-
- public ReferenceDecorator getRefs(int index) {
- if (isOrigin) {
- return new ReferenceDecorator(segmentObject.getRefs(index), this);
- } else {
- return new ReferenceDecorator(segmentBuilder.getRefsBuilder(index), this);
- }
- }
-
- public byte[] toByteArray() {
- if (isOrigin) {
- return segmentObject.toByteArray();
- } else {
- return segmentBuilder.build().toByteArray();
- }
- }
-
- @Override public void toBuilder() {
- if (isOrigin) {
- this.isOrigin = false;
- this.segmentBuilder = segmentObject.toBuilder();
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardization.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardization.java
deleted file mode 100644
index b3f8125d14ae..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardization.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-import org.skywalking.apm.collector.core.data.EndOfBatchQueueMessage;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentStandardization extends EndOfBatchQueueMessage {
-
- public SegmentStandardization(String key) {
- super(key);
- }
-
- private UpstreamSegment upstreamSegment;
-
- public UpstreamSegment getUpstreamSegment() {
- return upstreamSegment;
- }
-
- public void setUpstreamSegment(UpstreamSegment upstreamSegment) {
- this.upstreamSegment = upstreamSegment;
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardizationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardizationWorker.java
deleted file mode 100644
index 0383d9327351..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SegmentStandardizationWorker.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-import org.skywalking.apm.collector.agent.stream.buffer.SegmentBufferManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentStandardizationWorker extends AbstractLocalAsyncWorker {
-
- private final Logger logger = LoggerFactory.getLogger(SegmentStandardizationWorker.class);
-
- public SegmentStandardizationWorker(ModuleManager moduleManager) {
- super(moduleManager);
- SegmentBufferManager.INSTANCE.initialize(moduleManager);
- }
-
- @Override public int id() {
- return SegmentStandardizationWorker.class.hashCode();
- }
-
- @Override protected void onWork(SegmentStandardization segmentStandardization) throws WorkerException {
- SegmentBufferManager.INSTANCE.writeBuffer(segmentStandardization.getUpstreamSegment());
- }
-
- public final void flushAndSwitch() {
- SegmentBufferManager.INSTANCE.flush();
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public SegmentStandardizationWorker workerInstance(ModuleManager moduleManager) {
- SegmentStandardizationWorker standardizationWorker = new SegmentStandardizationWorker(moduleManager);
- startTimer(standardizationWorker);
- return standardizationWorker;
- }
-
- @Override public int queueSize() {
- return 1024;
- }
-
- private void startTimer(SegmentStandardizationWorker standardizationWorker) {
- Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(standardizationWorker::flushAndSwitch, 10, 3, TimeUnit.SECONDS);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SpanDecorator.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SpanDecorator.java
deleted file mode 100644
index a6f6fe0e1433..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SpanDecorator.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-import org.skywalking.apm.network.proto.SpanLayer;
-import org.skywalking.apm.network.proto.SpanObject;
-import org.skywalking.apm.network.proto.SpanType;
-
-/**
- * @author peng-yongsheng
- */
-public class SpanDecorator implements StandardBuilder {
- private boolean isOrigin = true;
- private StandardBuilder standardBuilder;
- private SpanObject spanObject;
- private SpanObject.Builder spanBuilder;
-
- public SpanDecorator(SpanObject spanObject, StandardBuilder standardBuilder) {
- this.spanObject = spanObject;
- this.standardBuilder = standardBuilder;
- }
-
- public SpanDecorator(SpanObject.Builder spanBuilder, StandardBuilder standardBuilder) {
- this.spanBuilder = spanBuilder;
- this.standardBuilder = standardBuilder;
- this.isOrigin = false;
- }
-
- public int getSpanId() {
- if (isOrigin) {
- return spanObject.getSpanId();
- } else {
- return spanBuilder.getSpanId();
- }
- }
-
- public int getParentSpanId() {
- if (isOrigin) {
- return spanObject.getParentSpanId();
- } else {
- return spanBuilder.getParentSpanId();
- }
- }
-
- public SpanType getSpanType() {
- if (isOrigin) {
- return spanObject.getSpanType();
- } else {
- return spanBuilder.getSpanType();
- }
- }
-
- public int getSpanTypeValue() {
- if (isOrigin) {
- return spanObject.getSpanTypeValue();
- } else {
- return spanBuilder.getSpanTypeValue();
- }
- }
-
- public SpanLayer getSpanLayer() {
- if (isOrigin) {
- return spanObject.getSpanLayer();
- } else {
- return spanBuilder.getSpanLayer();
- }
- }
-
- public int getSpanLayerValue() {
- if (isOrigin) {
- return spanObject.getSpanLayerValue();
- } else {
- return spanBuilder.getSpanLayerValue();
- }
- }
-
- public long getStartTime() {
- if (isOrigin) {
- return spanObject.getStartTime();
- } else {
- return spanBuilder.getStartTime();
- }
- }
-
- public long getEndTime() {
- if (isOrigin) {
- return spanObject.getEndTime();
- } else {
- return spanBuilder.getEndTime();
- }
- }
-
- public int getComponentId() {
- if (isOrigin) {
- return spanObject.getComponentId();
- } else {
- return spanBuilder.getComponentId();
- }
- }
-
- public String getComponent() {
- if (isOrigin) {
- return spanObject.getComponent();
- } else {
- return spanBuilder.getComponent();
- }
- }
-
- public int getPeerId() {
- if (isOrigin) {
- return spanObject.getPeerId();
- } else {
- return spanBuilder.getPeerId();
- }
- }
-
- public void setPeerId(int peerId) {
- if (isOrigin) {
- toBuilder();
- }
- spanBuilder.setPeerId(peerId);
- }
-
- public String getPeer() {
- if (isOrigin) {
- return spanObject.getPeer();
- } else {
- return spanBuilder.getPeer();
- }
- }
-
- public void setPeer(String peer) {
- if (isOrigin) {
- toBuilder();
- }
- spanBuilder.setPeer(peer);
- }
-
- public int getOperationNameId() {
- if (isOrigin) {
- return spanObject.getOperationNameId();
- } else {
- return spanBuilder.getOperationNameId();
- }
- }
-
- public void setOperationNameId(int value) {
- if (isOrigin) {
- toBuilder();
- }
- spanBuilder.setOperationNameId(value);
- }
-
- public String getOperationName() {
- if (isOrigin) {
- return spanObject.getOperationName();
- } else {
- return spanBuilder.getOperationName();
- }
- }
-
- public void setOperationName(String value) {
- if (isOrigin) {
- toBuilder();
- }
- spanBuilder.setOperationName(value);
- }
-
- public boolean getIsError() {
- if (isOrigin) {
- return spanObject.getIsError();
- } else {
- return spanBuilder.getIsError();
- }
- }
-
- @Override public void toBuilder() {
- if (this.isOrigin) {
- this.isOrigin = false;
- spanBuilder = spanObject.toBuilder();
- standardBuilder.toBuilder();
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SpanIdExchanger.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SpanIdExchanger.java
deleted file mode 100644
index 68f7ca52f6fa..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/SpanIdExchanger.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-import org.skywalking.apm.collector.agent.stream.worker.register.ApplicationIDService;
-import org.skywalking.apm.collector.agent.stream.worker.register.ServiceNameService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class SpanIdExchanger implements IdExchanger {
-
- private final Logger logger = LoggerFactory.getLogger(SpanIdExchanger.class);
-
- private static SpanIdExchanger EXCHANGER;
- private final ApplicationIDService applicationIDService;
- private final ServiceNameService serviceNameService;
-
- public static SpanIdExchanger getInstance(ModuleManager moduleManager) {
- if (EXCHANGER == null) {
- EXCHANGER = new SpanIdExchanger(moduleManager);
- }
- return EXCHANGER;
- }
-
- private SpanIdExchanger(ModuleManager moduleManager) {
- this.applicationIDService = new ApplicationIDService(moduleManager);
- this.serviceNameService = new ServiceNameService(moduleManager);
- }
-
- @Override public boolean exchange(SpanDecorator standardBuilder, int applicationId) {
- if (standardBuilder.getPeerId() == 0 && StringUtils.isNotEmpty(standardBuilder.getPeer())) {
- int peerId = applicationIDService.getOrCreate(standardBuilder.getPeer());
- if (peerId == 0) {
- logger.debug("peer: {} in application: {} exchange failed", standardBuilder.getPeer(), applicationId);
- return false;
- } else {
- standardBuilder.toBuilder();
- standardBuilder.setPeerId(peerId);
- standardBuilder.setPeer(Const.EMPTY_STRING);
- }
- }
-
- if (standardBuilder.getOperationNameId() == 0 && StringUtils.isNotEmpty(standardBuilder.getOperationName())) {
- int operationNameId = serviceNameService.getOrCreate(applicationId, standardBuilder.getOperationName());
-
- if (operationNameId == 0) {
- logger.debug("service name: {} from application id: {} exchange failed", standardBuilder.getOperationName(), applicationId);
- return false;
- } else {
- standardBuilder.toBuilder();
- standardBuilder.setOperationNameId(operationNameId);
- standardBuilder.setOperationName(Const.EMPTY_STRING);
- }
- }
- return true;
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/StandardBuilder.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/StandardBuilder.java
deleted file mode 100644
index efdc89ae76c8..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/parser/standardization/StandardBuilder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.parser.standardization;
-
-/**
- * @author peng-yongsheng
- */
-public interface StandardBuilder {
- void toBuilder();
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/util/FileUtils.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/util/FileUtils.java
deleted file mode 100644
index 02608fafbea9..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/util/FileUtils.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.util;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import org.skywalking.apm.collector.core.util.Const;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public enum FileUtils {
- INSTANCE;
-
- private final Logger logger = LoggerFactory.getLogger(FileUtils.class);
-
- public String readLastLine(File file) {
- RandomAccessFile randomAccessFile = null;
- try {
- randomAccessFile = new RandomAccessFile(file, "r");
- long length = randomAccessFile.length();
- if (length == 0) {
- return Const.EMPTY_STRING;
- } else {
- long position = length - 1;
- randomAccessFile.seek(position);
- while (position >= 0) {
- if (randomAccessFile.read() == '\n') {
- return randomAccessFile.readLine();
- }
- randomAccessFile.seek(position);
- if (position == 0) {
- return randomAccessFile.readLine();
- }
- position--;
- }
- }
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- } finally {
- if (randomAccessFile != null) {
- try {
- randomAccessFile.close();
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- }
- }
- return Const.EMPTY_STRING;
- }
-
- public void writeAppendToLast(File file, RandomAccessFile randomAccessFile, String value) {
- if (randomAccessFile == null) {
- try {
- randomAccessFile = new RandomAccessFile(file, "rwd");
- } catch (FileNotFoundException e) {
- logger.error(e.getMessage(), e);
- }
- }
- try {
- long length = randomAccessFile.length();
- randomAccessFile.seek(length);
- randomAccessFile.writeBytes(System.lineSeparator());
- randomAccessFile.writeBytes(value);
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java
deleted file mode 100644
index 65eee6eed348..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker;
-
-import org.skywalking.apm.collector.remote.service.RemoteDataRegisterService;
-import org.skywalking.apm.collector.storage.table.node.NodeComponent;
-import org.skywalking.apm.collector.storage.table.node.NodeMapping;
-import org.skywalking.apm.collector.storage.table.noderef.NodeReference;
-import org.skywalking.apm.collector.storage.table.register.Application;
-import org.skywalking.apm.collector.storage.table.register.Instance;
-import org.skywalking.apm.collector.storage.table.register.ServiceName;
-import org.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.skywalking.apm.collector.storage.table.serviceref.ServiceReference;
-
-/**
- * @author peng-yongsheng
- */
-public class AgentStreamRemoteDataRegister {
-
- private final RemoteDataRegisterService remoteDataRegisterService;
-
- public AgentStreamRemoteDataRegister(RemoteDataRegisterService remoteDataRegisterService) {
- this.remoteDataRegisterService = remoteDataRegisterService;
- }
-
- public void register() {
- remoteDataRegisterService.register(Application.class, Application::new);
- remoteDataRegisterService.register(Instance.class, Instance::new);
- remoteDataRegisterService.register(ServiceName.class, ServiceName::new);
-
- remoteDataRegisterService.register(NodeComponent.class, NodeComponent::new);
- remoteDataRegisterService.register(NodeMapping.class, NodeMapping::new);
- remoteDataRegisterService.register(NodeReference.class, NodeReference::new);
- remoteDataRegisterService.register(ServiceEntry.class, ServiceEntry::new);
- remoteDataRegisterService.register(ServiceReference.class, ServiceReference::new);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java
deleted file mode 100644
index f4d58a9af23e..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.jvm.CpuMetric;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class CpuMetricPersistenceWorker extends PersistenceWorker {
-
- public CpuMetricPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return 0;
- }
-
- @Override protected boolean needMergeDBData() {
- return false;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(ICpuMetricPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public CpuMetricPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new CpuMetricPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricService.java
deleted file mode 100644
index 1bbb03bd0411..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.agent.stream.graph.JvmMetricStreamGraph;
-import org.skywalking.apm.collector.agent.stream.service.jvm.ICpuMetricService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.table.jvm.CpuMetric;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class CpuMetricService implements ICpuMetricService {
-
- private final Logger logger = LoggerFactory.getLogger(CpuMetricService.class);
-
- private Graph cpuMetricGraph;
-
- private Graph getCpuMetricGraph() {
- if (ObjectUtils.isEmpty(cpuMetricGraph)) {
- cpuMetricGraph = GraphManager.INSTANCE.createIfAbsent(JvmMetricStreamGraph.CPU_METRIC_GRAPH_ID, CpuMetric.class);
- }
- return cpuMetricGraph;
- }
-
- @Override public void send(int instanceId, long timeBucket, double usagePercent) {
- CpuMetric cpuMetric = new CpuMetric(timeBucket + Const.ID_SPLIT + instanceId);
- cpuMetric.setInstanceId(instanceId);
- cpuMetric.setUsagePercent(usagePercent);
- cpuMetric.setTimeBucket(timeBucket);
-
- logger.debug("push to cpu metric graph, id: {}", cpuMetric.getId());
- getCpuMetricGraph().start(cpuMetric);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java
deleted file mode 100644
index 49e3a6b85336..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.jvm.GCMetric;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class GCMetricPersistenceWorker extends PersistenceWorker {
-
- public GCMetricPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return 0;
- }
-
- @Override protected boolean needMergeDBData() {
- return false;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(IGCMetricPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public GCMetricPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new GCMetricPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricService.java
deleted file mode 100644
index e2ae3a348c80..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.agent.stream.graph.JvmMetricStreamGraph;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IGCMetricService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.table.jvm.GCMetric;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class GCMetricService implements IGCMetricService {
-
- private final Logger logger = LoggerFactory.getLogger(GCMetricService.class);
-
- private Graph gcMetricGraph;
-
- private Graph getGcMetricGraph() {
- if (ObjectUtils.isEmpty(gcMetricGraph)) {
- gcMetricGraph = GraphManager.INSTANCE.createIfAbsent(JvmMetricStreamGraph.GC_METRIC_GRAPH_ID, GCMetric.class);
- }
- return gcMetricGraph;
- }
-
- @Override public void send(int instanceId, long timeBucket, int phraseValue, long count, long time) {
- GCMetric gcMetric = new GCMetric(timeBucket + Const.ID_SPLIT + instanceId + Const.ID_SPLIT + String.valueOf(phraseValue));
- gcMetric.setInstanceId(instanceId);
- gcMetric.setPhrase(phraseValue);
- gcMetric.setCount(count);
- gcMetric.setTime(time);
- gcMetric.setTimeBucket(timeBucket);
-
- logger.debug("push to gc metric graph, id: {}", gcMetric.getId());
- getGcMetricGraph().start(gcMetric);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java
deleted file mode 100644
index 57b9108a377f..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.IInstanceHeartBeatPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.register.Instance;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class InstHeartBeatPersistenceWorker extends PersistenceWorker {
-
- public InstHeartBeatPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return InstHeartBeatPersistenceWorker.class.hashCode();
- }
-
- @Override protected boolean needMergeDBData() {
- return true;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(IInstanceHeartBeatPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public InstHeartBeatPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new InstHeartBeatPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstanceHeartBeatService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstanceHeartBeatService.java
deleted file mode 100644
index 8ef9c3506180..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstanceHeartBeatService.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.agent.stream.graph.JvmMetricStreamGraph;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IInstanceHeartBeatService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.register.Instance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class InstanceHeartBeatService implements IInstanceHeartBeatService {
-
- private final Logger logger = LoggerFactory.getLogger(InstanceHeartBeatService.class);
-
- private Graph heartBeatGraph;
-
- private Graph getHeartBeatGraph() {
- if (ObjectUtils.isEmpty(heartBeatGraph)) {
- this.heartBeatGraph = GraphManager.INSTANCE.createIfAbsent(JvmMetricStreamGraph.INST_HEART_BEAT_GRAPH_ID, Instance.class);
- }
- return heartBeatGraph;
- }
-
- @Override public void send(int instanceId, long heartBeatTime) {
- Instance instance = new Instance(String.valueOf(instanceId));
- instance.setHeartBeatTime(TimeBucketUtils.INSTANCE.getSecondTimeBucket(heartBeatTime));
- instance.setInstanceId(instanceId);
-
- logger.debug("push to instance heart beat persistence worker, id: {}", instance.getId());
- getHeartBeatGraph().start(instance);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java
deleted file mode 100644
index 6840da97b0ee..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.IMemoryMetricPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.jvm.MemoryMetric;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class MemoryMetricPersistenceWorker extends PersistenceWorker {
-
- public MemoryMetricPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return 0;
- }
-
- @Override protected boolean needMergeDBData() {
- return false;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(IMemoryMetricPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public MemoryMetricPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new MemoryMetricPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricService.java
deleted file mode 100644
index 32d5e8f2e95b..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.agent.stream.graph.JvmMetricStreamGraph;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IMemoryMetricService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.table.jvm.MemoryMetric;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class MemoryMetricService implements IMemoryMetricService {
-
- private final Logger logger = LoggerFactory.getLogger(MemoryMetricService.class);
-
- private Graph memoryMetricGraph;
-
- private Graph getMemoryMetricGraph() {
- if (ObjectUtils.isEmpty(memoryMetricGraph)) {
- this.memoryMetricGraph = GraphManager.INSTANCE.createIfAbsent(JvmMetricStreamGraph.MEMORY_METRIC_GRAPH_ID, MemoryMetric.class);
- }
- return memoryMetricGraph;
- }
-
- @Override
- public void send(int instanceId, long timeBucket, boolean isHeap, long init, long max, long used, long commited) {
- MemoryMetric memoryMetric = new MemoryMetric(timeBucket + Const.ID_SPLIT + instanceId + Const.ID_SPLIT + String.valueOf(isHeap));
- memoryMetric.setInstanceId(instanceId);
- memoryMetric.setIsHeap(isHeap);
- memoryMetric.setInit(init);
- memoryMetric.setMax(max);
- memoryMetric.setUsed(used);
- memoryMetric.setCommitted(commited);
- memoryMetric.setTimeBucket(timeBucket);
-
- logger.debug("push to memory metric graph, id: {}", memoryMetric.getId());
- getMemoryMetricGraph().start(memoryMetric);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java
deleted file mode 100644
index f0a8257f6e97..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker {
-
- @Override public int id() {
- return 0;
- }
-
- public MemoryPoolMetricPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override protected boolean needMergeDBData() {
- return false;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(IMemoryPoolMetricPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public MemoryPoolMetricPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new MemoryPoolMetricPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricService.java
deleted file mode 100644
index 8e4aed00a48b..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.jvm;
-
-import org.skywalking.apm.collector.agent.stream.graph.JvmMetricStreamGraph;
-import org.skywalking.apm.collector.agent.stream.service.jvm.IMemoryPoolMetricService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class MemoryPoolMetricService implements IMemoryPoolMetricService {
-
- private final Logger logger = LoggerFactory.getLogger(MemoryPoolMetricService.class);
-
- private Graph memoryPoolMetricGraph;
-
- private Graph getMemoryPoolMetricGraph() {
- if (ObjectUtils.isEmpty(memoryPoolMetricGraph)) {
- this.memoryPoolMetricGraph = GraphManager.INSTANCE.createIfAbsent(JvmMetricStreamGraph.MEMORY_POOL_METRIC_GRAPH_ID, MemoryPoolMetric.class);
- }
- return memoryPoolMetricGraph;
- }
-
- @Override
- public void send(int instanceId, long timeBucket, int poolType, long init, long max, long used, long commited) {
- MemoryPoolMetric memoryPoolMetric = new MemoryPoolMetric(timeBucket + Const.ID_SPLIT + instanceId + Const.ID_SPLIT + String.valueOf(poolType));
- memoryPoolMetric.setInstanceId(instanceId);
- memoryPoolMetric.setPoolType(poolType);
- memoryPoolMetric.setInit(init);
- memoryPoolMetric.setMax(max);
- memoryPoolMetric.setUsed(used);
- memoryPoolMetric.setCommitted(commited);
- memoryPoolMetric.setTimeBucket(timeBucket);
-
- logger.debug("push to memory pool metric graph, id: {}", memoryPoolMetric.getId());
- getMemoryPoolMetricGraph().start(memoryPoolMetric);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationIDService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationIDService.java
deleted file mode 100644
index 42aa307ba432..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationIDService.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.agent.stream.graph.RegisterStreamGraph;
-import org.skywalking.apm.collector.agent.stream.service.register.IApplicationIDService;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.ApplicationCacheService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.table.register.Application;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationIDService implements IApplicationIDService {
-
- private final Logger logger = LoggerFactory.getLogger(ApplicationIDService.class);
-
- private final ModuleManager moduleManager;
- private ApplicationCacheService applicationCacheService;
- private Graph applicationRegisterGraph;
-
- public ApplicationIDService(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- }
-
- private Graph getApplicationRegisterGraph() {
- if (ObjectUtils.isEmpty(applicationRegisterGraph)) {
- this.applicationRegisterGraph = GraphManager.INSTANCE.createIfAbsent(RegisterStreamGraph.APPLICATION_REGISTER_GRAPH_ID, Application.class);
- }
- return this.applicationRegisterGraph;
- }
-
- private ApplicationCacheService getApplicationCacheService() {
- if (ObjectUtils.isEmpty(applicationCacheService)) {
- this.applicationCacheService = moduleManager.find(CacheModule.NAME).getService(ApplicationCacheService.class);
- }
- return applicationCacheService;
- }
-
- public int getOrCreate(String applicationCode) {
- int applicationId = getApplicationCacheService().get(applicationCode);
-
- if (applicationId == 0) {
- Application application = new Application(applicationCode);
- application.setApplicationCode(applicationCode);
- application.setApplicationId(0);
-
- getApplicationRegisterGraph().start(application);
- }
- return applicationId;
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java
deleted file mode 100644
index 8d828766c9f7..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterRemoteWorker.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.remote.service.Selector;
-import org.skywalking.apm.collector.storage.table.register.Application;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationRegisterRemoteWorker extends AbstractRemoteWorker {
-
- private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterRemoteWorker.class);
-
- public ApplicationRegisterRemoteWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return ApplicationRegisterRemoteWorker.class.hashCode();
- }
-
- @Override protected void onWork(Application message) throws WorkerException {
- logger.debug("application code: {}", message.getApplicationCode());
- onNext(message);
- }
-
- @Override public Selector selector() {
- return Selector.ForeverFirst;
- }
-
- public static class Factory extends AbstractRemoteWorkerProvider {
-
- public Factory(ModuleManager moduleManager, RemoteSenderService remoteSenderService, int graphId) {
- super(moduleManager, remoteSenderService, graphId);
- }
-
- @Override public ApplicationRegisterRemoteWorker workerInstance(ModuleManager moduleManager) {
- return new ApplicationRegisterRemoteWorker(moduleManager);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java
deleted file mode 100644
index ff55da51dea1..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.agent.stream.IdAutoIncrement;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.ApplicationCacheService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IApplicationRegisterDAO;
-import org.skywalking.apm.collector.storage.table.register.Application;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker {
-
- private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterSerialWorker.class);
-
- private final IApplicationRegisterDAO applicationRegisterDAO;
- private final ApplicationCacheService applicationCacheService;
-
- public ApplicationRegisterSerialWorker(ModuleManager moduleManager) {
- super(moduleManager);
- this.applicationRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IApplicationRegisterDAO.class);
- this.applicationCacheService = getModuleManager().find(CacheModule.NAME).getService(ApplicationCacheService.class);
- }
-
- @Override public int id() {
- return ApplicationRegisterSerialWorker.class.hashCode();
- }
-
- @Override protected void onWork(Application application) throws WorkerException {
- logger.debug("register application, application code: {}", application.getApplicationCode());
- int applicationId = applicationCacheService.get(application.getApplicationCode());
-
- if (applicationId == 0) {
- Application newApplication;
- int min = applicationRegisterDAO.getMinApplicationId();
- if (min == 0) {
- Application userApplication = new Application(String.valueOf(Const.USER_ID));
- userApplication.setApplicationCode(Const.USER_CODE);
- userApplication.setApplicationId(Const.USER_ID);
- applicationRegisterDAO.save(userApplication);
-
- newApplication = new Application("-1");
- newApplication.setApplicationId(-1);
- newApplication.setApplicationCode(application.getApplicationCode());
- } else {
- int max = applicationRegisterDAO.getMaxApplicationId();
- applicationId = IdAutoIncrement.INSTANCE.increment(min, max);
-
- newApplication = new Application(String.valueOf(applicationId));
- newApplication.setApplicationId(applicationId);
- newApplication.setApplicationCode(application.getApplicationCode());
- }
- applicationRegisterDAO.save(newApplication);
- }
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public ApplicationRegisterSerialWorker workerInstance(ModuleManager moduleManager) {
- return new ApplicationRegisterSerialWorker(moduleManager);
- }
-
- @Override public int queueSize() {
- return 256;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceIDService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceIDService.java
deleted file mode 100644
index 4f1c94231d98..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceIDService.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.agent.stream.graph.RegisterStreamGraph;
-import org.skywalking.apm.collector.agent.stream.service.register.IInstanceIDService;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.InstanceCacheService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IInstanceRegisterDAO;
-import org.skywalking.apm.collector.storage.table.register.Instance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class InstanceIDService implements IInstanceIDService {
-
- private final Logger logger = LoggerFactory.getLogger(InstanceIDService.class);
-
- private final ModuleManager moduleManager;
- private InstanceCacheService instanceCacheService;
- private Graph instanceRegisterGraph;
- private IInstanceRegisterDAO instanceRegisterDAO;
-
- public InstanceIDService(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- }
-
- private InstanceCacheService getInstanceCacheService() {
- if (ObjectUtils.isEmpty(instanceCacheService)) {
- instanceCacheService = moduleManager.find(CacheModule.NAME).getService(InstanceCacheService.class);
- }
- return instanceCacheService;
- }
-
- private Graph getInstanceRegisterGraph() {
- if (ObjectUtils.isEmpty(instanceRegisterGraph)) {
- this.instanceRegisterGraph = GraphManager.INSTANCE.createIfAbsent(RegisterStreamGraph.INSTANCE_REGISTER_GRAPH_ID, Instance.class);
- }
- return instanceRegisterGraph;
- }
-
- private IInstanceRegisterDAO getInstanceRegisterDAO() {
- if (ObjectUtils.isEmpty(instanceRegisterDAO)) {
- instanceRegisterDAO = moduleManager.find(StorageModule.NAME).getService(IInstanceRegisterDAO.class);
- }
- return instanceRegisterDAO;
- }
-
- public int getOrCreate(int applicationId, String agentUUID, long registerTime, String osInfo) {
- logger.debug("get or create instance id, application id: {}, agentUUID: {}, registerTime: {}, osInfo: {}", applicationId, agentUUID, registerTime, osInfo);
- int instanceId = getInstanceCacheService().getInstanceId(applicationId, agentUUID);
-
- if (instanceId == 0) {
- Instance instance = new Instance("0");
- instance.setApplicationId(applicationId);
- instance.setAgentUUID(agentUUID);
- instance.setRegisterTime(registerTime);
- instance.setHeartBeatTime(registerTime);
- instance.setInstanceId(0);
- instance.setOsInfo(osInfo);
-
- getInstanceRegisterGraph().start(instance);
- }
- return instanceId;
- }
-
- public void recover(int instanceId, int applicationId, long registerTime, String osInfo) {
- logger.debug("instance recover, instance id: {}, application id: {}, register time: {}", instanceId, applicationId, registerTime);
- Instance instance = new Instance(String.valueOf(instanceId));
- instance.setApplicationId(applicationId);
- instance.setAgentUUID("");
- instance.setRegisterTime(registerTime);
- instance.setHeartBeatTime(registerTime);
- instance.setInstanceId(instanceId);
- instance.setOsInfo(osInfo);
-
- getInstanceRegisterDAO().save(instance);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterRemoteWorker.java
deleted file mode 100644
index 07ba0fcc9be7..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterRemoteWorker.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.remote.service.Selector;
-import org.skywalking.apm.collector.storage.table.register.Instance;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class InstanceRegisterRemoteWorker extends AbstractRemoteWorker {
-
- private final Logger logger = LoggerFactory.getLogger(InstanceRegisterRemoteWorker.class);
-
- @Override public int id() {
- return InstanceRegisterRemoteWorker.class.hashCode();
- }
-
- InstanceRegisterRemoteWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override protected void onWork(Instance instance) throws WorkerException {
- logger.debug("application id: {}, agentUUID: {}, register time: {}", instance.getApplicationId(), instance.getAgentUUID(), instance.getRegisterTime());
- onNext(instance);
- }
-
- @Override public Selector selector() {
- return Selector.ForeverFirst;
- }
-
- public static class Factory extends AbstractRemoteWorkerProvider {
-
- public Factory(ModuleManager moduleManager, RemoteSenderService remoteSenderService, int graphId) {
- super(moduleManager, remoteSenderService, graphId);
- }
-
- @Override public InstanceRegisterRemoteWorker workerInstance(ModuleManager moduleManager) {
- return new InstanceRegisterRemoteWorker(moduleManager);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java
deleted file mode 100644
index 41bbd5836730..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.InstanceCacheService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IInstanceRegisterDAO;
-import org.skywalking.apm.collector.storage.table.register.Instance;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker {
-
- private final Logger logger = LoggerFactory.getLogger(InstanceRegisterSerialWorker.class);
-
- private final InstanceCacheService instanceCacheService;
- private final IInstanceRegisterDAO instanceRegisterDAO;
-
- public InstanceRegisterSerialWorker(ModuleManager moduleManager) {
- super(moduleManager);
- this.instanceCacheService = getModuleManager().find(CacheModule.NAME).getService(InstanceCacheService.class);
- this.instanceRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IInstanceRegisterDAO.class);
- }
-
- @Override public int id() {
- return InstanceRegisterSerialWorker.class.hashCode();
- }
-
- @Override protected void onWork(Instance instance) throws WorkerException {
- logger.debug("register instance, application id: {}, agentUUID: {}", instance.getApplicationId(), instance.getAgentUUID());
- int instanceId = instanceCacheService.getInstanceId(instance.getApplicationId(), instance.getAgentUUID());
- if (instanceId == 0) {
- Instance newInstance;
-
- int min = instanceRegisterDAO.getMinInstanceId();
- int max = instanceRegisterDAO.getMaxInstanceId();
- if (min == 0 && max == 0) {
- newInstance = new Instance("1");
- newInstance.setInstanceId(1);
- newInstance.setApplicationId(instance.getApplicationId());
- newInstance.setAgentUUID(instance.getAgentUUID());
- newInstance.setHeartBeatTime(instance.getHeartBeatTime());
- newInstance.setOsInfo(instance.getOsInfo());
- newInstance.setRegisterTime(instance.getRegisterTime());
- } else {
- newInstance = new Instance(String.valueOf(max + 1));
- newInstance.setInstanceId(max + 1);
- newInstance.setApplicationId(instance.getApplicationId());
- newInstance.setAgentUUID(instance.getAgentUUID());
- newInstance.setHeartBeatTime(instance.getHeartBeatTime());
- newInstance.setOsInfo(instance.getOsInfo());
- newInstance.setRegisterTime(instance.getRegisterTime());
- }
- instanceRegisterDAO.save(newInstance);
- }
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public InstanceRegisterSerialWorker workerInstance(ModuleManager moduleManager) {
- return new InstanceRegisterSerialWorker(moduleManager);
- }
-
- @Override public int queueSize() {
- return 256;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterRemoteWorker.java
deleted file mode 100644
index 87793be3163d..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterRemoteWorker.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.remote.service.Selector;
-import org.skywalking.apm.collector.storage.table.register.ServiceName;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceNameRegisterRemoteWorker extends AbstractRemoteWorker {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceNameRegisterRemoteWorker.class);
-
- public ServiceNameRegisterRemoteWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return ServiceNameRegisterRemoteWorker.class.hashCode();
- }
-
- @Override protected void onWork(ServiceName serviceName) throws WorkerException {
- onNext(serviceName);
- }
-
- @Override public Selector selector() {
- return Selector.ForeverFirst;
- }
-
- public static class Factory extends AbstractRemoteWorkerProvider {
-
- public Factory(ModuleManager moduleManager, RemoteSenderService remoteSenderService, int graphId) {
- super(moduleManager, remoteSenderService, graphId);
- }
-
- @Override public ServiceNameRegisterRemoteWorker workerInstance(ModuleManager moduleManager) {
- return new ServiceNameRegisterRemoteWorker(moduleManager);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java
deleted file mode 100644
index f0b8a6708a9f..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.agent.stream.IdAutoIncrement;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.ServiceIdCacheService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IServiceNameRegisterDAO;
-import org.skywalking.apm.collector.storage.table.register.ServiceName;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceNameRegisterSerialWorker extends AbstractLocalAsyncWorker {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceNameRegisterSerialWorker.class);
-
- private final IServiceNameRegisterDAO serviceNameRegisterDAO;
- private final ServiceIdCacheService serviceIdCacheService;
-
- public ServiceNameRegisterSerialWorker(ModuleManager moduleManager) {
- super(moduleManager);
- this.serviceNameRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IServiceNameRegisterDAO.class);
- this.serviceIdCacheService = getModuleManager().find(CacheModule.NAME).getService(ServiceIdCacheService.class);
- }
-
- @Override public int id() {
- return ServiceNameRegisterSerialWorker.class.hashCode();
- }
-
- @Override protected void onWork(ServiceName serviceName) throws WorkerException {
- logger.debug("register service name: {}, application id: {}", serviceName.getServiceName(), serviceName.getApplicationId());
- int serviceId = serviceIdCacheService.get(serviceName.getApplicationId(), serviceName.getServiceName());
- if (serviceId == 0) {
- ServiceName newServiceName;
-
- int min = serviceNameRegisterDAO.getMinServiceId();
- if (min == 0) {
- ServiceName noneServiceName = new ServiceName("1");
- noneServiceName.setApplicationId(0);
- noneServiceName.setServiceId(Const.NONE_SERVICE_ID);
- noneServiceName.setServiceName(Const.NONE_SERVICE_NAME);
- serviceNameRegisterDAO.save(noneServiceName);
-
- newServiceName = new ServiceName("-1");
- newServiceName.setApplicationId(serviceName.getApplicationId());
- newServiceName.setServiceId(-1);
- newServiceName.setServiceName(serviceName.getServiceName());
- } else {
- int max = serviceNameRegisterDAO.getMaxServiceId();
- serviceId = IdAutoIncrement.INSTANCE.increment(min, max);
-
- newServiceName = new ServiceName(String.valueOf(serviceId));
- newServiceName.setApplicationId(serviceName.getApplicationId());
- newServiceName.setServiceId(serviceId);
- newServiceName.setServiceName(serviceName.getServiceName());
- }
- serviceNameRegisterDAO.save(newServiceName);
- }
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public ServiceNameRegisterSerialWorker workerInstance(ModuleManager moduleManager) {
- return new ServiceNameRegisterSerialWorker(moduleManager);
- }
-
- @Override public int queueSize() {
- return 256;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameService.java
deleted file mode 100644
index 27a98f0739f1..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/register/ServiceNameService.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.register;
-
-import org.skywalking.apm.collector.agent.stream.graph.RegisterStreamGraph;
-import org.skywalking.apm.collector.agent.stream.service.register.IServiceNameService;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.ServiceIdCacheService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.table.register.ServiceName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceNameService implements IServiceNameService {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceNameService.class);
-
- private final ModuleManager moduleManager;
- private ServiceIdCacheService serviceIdCacheService;
- private Graph serviceNameRegisterGraph;
-
- public ServiceNameService(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- }
-
- private ServiceIdCacheService getServiceIdCacheService() {
- if (ObjectUtils.isEmpty(serviceIdCacheService)) {
- serviceIdCacheService = moduleManager.find(CacheModule.NAME).getService(ServiceIdCacheService.class);
- }
- return serviceIdCacheService;
- }
-
- private Graph getServiceNameRegisterGraph() {
- if (ObjectUtils.isEmpty(serviceNameRegisterGraph)) {
- this.serviceNameRegisterGraph = GraphManager.INSTANCE.createIfAbsent(RegisterStreamGraph.SERVICE_NAME_REGISTER_GRAPH_ID, ServiceName.class);
- }
- return serviceNameRegisterGraph;
- }
-
- public int getOrCreate(int applicationId, String serviceName) {
- int serviceId = getServiceIdCacheService().get(applicationId, serviceName);
-
- if (serviceId == 0) {
- ServiceName service = new ServiceName("0");
- service.setApplicationId(applicationId);
- service.setServiceName(serviceName);
- service.setServiceId(0);
-
- getServiceNameRegisterGraph().start(service);
- }
- return serviceId;
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/TraceSegmentService.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/TraceSegmentService.java
deleted file mode 100644
index 86832dde8af4..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/TraceSegmentService.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace;
-
-import org.skywalking.apm.collector.agent.stream.parser.SegmentParse;
-import org.skywalking.apm.collector.agent.stream.service.trace.ITraceSegmentService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.network.proto.UpstreamSegment;
-
-/**
- * @author peng-yongsheng
- */
-public class TraceSegmentService implements ITraceSegmentService {
-
- private final ModuleManager moduleManager;
-
- public TraceSegmentService(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- }
-
- public void send(UpstreamSegment segment) {
- SegmentParse segmentParse = new SegmentParse(moduleManager);
- segmentParse.parse(segment, SegmentParse.Source.Agent);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/global/GlobalTracePersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/global/GlobalTracePersistenceWorker.java
deleted file mode 100644
index 9d4a5d86e732..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/global/GlobalTracePersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.global;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.IGlobalTracePersistenceDAO;
-import org.skywalking.apm.collector.storage.table.global.GlobalTrace;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class GlobalTracePersistenceWorker extends PersistenceWorker {
-
- public GlobalTracePersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return 0;
- }
-
- @Override protected boolean needMergeDBData() {
- return false;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(IGlobalTracePersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public GlobalTracePersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new GlobalTracePersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/global/GlobalTraceSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/global/GlobalTraceSpanListener.java
deleted file mode 100644
index 21436f3aa7d3..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/global/GlobalTraceSpanListener.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.global;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.FirstSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.GlobalTraceIdsListener;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.global.GlobalTrace;
-import org.skywalking.apm.network.proto.UniqueId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class GlobalTraceSpanListener implements FirstSpanListener, GlobalTraceIdsListener {
-
- private final Logger logger = LoggerFactory.getLogger(GlobalTraceSpanListener.class);
-
- private List globalTraceIds = new ArrayList<>();
- private String segmentId;
- private long timeBucket;
-
- @Override
- public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- this.timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
- this.segmentId = segmentId;
- }
-
- @Override public void parseGlobalTraceId(UniqueId uniqueId) {
- StringBuilder globalTraceIdBuilder = new StringBuilder();
- for (int i = 0; i < uniqueId.getIdPartsList().size(); i++) {
- if (i == 0) {
- globalTraceIdBuilder.append(uniqueId.getIdPartsList().get(i));
- } else {
- globalTraceIdBuilder.append(".").append(uniqueId.getIdPartsList().get(i));
- }
- }
- globalTraceIds.add(globalTraceIdBuilder.toString());
- }
-
- @Override public void build() {
- logger.debug("global trace listener build");
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.GLOBAL_TRACE_GRAPH_ID, GlobalTrace.class);
- for (String globalTraceId : globalTraceIds) {
- GlobalTrace globalTrace = new GlobalTrace(segmentId + Const.ID_SPLIT + globalTraceId);
- globalTrace.setGlobalTraceId(globalTraceId);
- globalTrace.setSegmentId(segmentId);
- globalTrace.setTimeBucket(timeBucket);
- graph.start(globalTrace);
- }
- }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstPerformancePersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstPerformancePersistenceWorker.java
deleted file mode 100644
index 002dc0015a3f..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstPerformancePersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.instance;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.IInstPerformancePersistenceDAO;
-import org.skywalking.apm.collector.storage.table.instance.InstPerformance;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class InstPerformancePersistenceWorker extends PersistenceWorker {
-
- public InstPerformancePersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return InstPerformancePersistenceWorker.class.hashCode();
- }
-
- @Override protected boolean needMergeDBData() {
- return true;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(IInstPerformancePersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public InstPerformancePersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new InstPerformancePersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstPerformanceSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstPerformanceSpanListener.java
deleted file mode 100644
index 653b829f4d38..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/instance/InstPerformanceSpanListener.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.instance;
-
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.EntrySpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.FirstSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.instance.InstPerformance;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class InstPerformanceSpanListener implements EntrySpanListener, FirstSpanListener {
-
- private final Logger logger = LoggerFactory.getLogger(InstPerformanceSpanListener.class);
-
- private int applicationId;
- private int instanceId;
- private long cost;
- private long timeBucket;
-
- @Override
- public void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- }
-
- @Override
- public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- this.applicationId = applicationId;
- this.instanceId = instanceId;
- this.cost = spanDecorator.getEndTime() - spanDecorator.getStartTime();
- timeBucket = TimeBucketUtils.INSTANCE.getSecondTimeBucket(spanDecorator.getStartTime());
- }
-
- @Override public void build() {
- InstPerformance instPerformance = new InstPerformance(timeBucket + Const.ID_SPLIT + instanceId);
- instPerformance.setApplicationId(applicationId);
- instPerformance.setInstanceId(instanceId);
- instPerformance.setCalls(1);
- instPerformance.setCostTotal(cost);
- instPerformance.setTimeBucket(timeBucket);
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.INST_PERFORMANCE_GRAPH_ID, InstPerformance.class);
- graph.start(instPerformance);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentAggregationWorker.java
deleted file mode 100644
index 1789e4e75ab0..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentAggregationWorker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.node;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.table.node.NodeComponent;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeComponentAggregationWorker extends AggregationWorker {
-
- public NodeComponentAggregationWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return NodeComponentAggregationWorker.class.hashCode();
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public NodeComponentAggregationWorker workerInstance(ModuleManager moduleManager) {
- return new NodeComponentAggregationWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentPersistenceWorker.java
deleted file mode 100644
index f1f5a0785649..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentPersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.node;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.INodeComponentPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.node.NodeComponent;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeComponentPersistenceWorker extends PersistenceWorker {
-
- public NodeComponentPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return NodeComponentPersistenceWorker.class.hashCode();
- }
-
- @Override protected boolean needMergeDBData() {
- return true;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(INodeComponentPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public NodeComponentPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new NodeComponentPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentRemoteWorker.java
deleted file mode 100644
index d1b86441c576..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentRemoteWorker.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.node;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.remote.service.Selector;
-import org.skywalking.apm.collector.storage.table.node.NodeComponent;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeComponentRemoteWorker extends AbstractRemoteWorker {
-
- NodeComponentRemoteWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return NodeComponentRemoteWorker.class.hashCode();
- }
-
- @Override protected void onWork(NodeComponent nodeComponent) throws WorkerException {
- onNext(nodeComponent);
- }
-
- @Override public Selector selector() {
- return Selector.HashCode;
- }
-
- public static class Factory extends AbstractRemoteWorkerProvider {
-
- public Factory(ModuleManager moduleManager, RemoteSenderService remoteSenderService, int graphId) {
- super(moduleManager, remoteSenderService, graphId);
- }
-
- @Override public NodeComponentRemoteWorker workerInstance(ModuleManager moduleManager) {
- return new NodeComponentRemoteWorker(moduleManager);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentSpanListener.java
deleted file mode 100644
index 0c2ae793a2bd..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeComponentSpanListener.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.node;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.EntrySpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.ExitSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.FirstSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.node.NodeComponent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeComponentSpanListener implements EntrySpanListener, ExitSpanListener, FirstSpanListener {
-
- private final Logger logger = LoggerFactory.getLogger(NodeComponentSpanListener.class);
-
- private List nodeComponents = new ArrayList<>();
- private long timeBucket;
-
- @Override
- public void parseExit(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) {
- NodeComponent nodeComponent = new NodeComponent(Const.EMPTY_STRING);
- nodeComponent.setComponentId(spanDecorator.getComponentId());
- nodeComponent.setPeerId(spanDecorator.getPeerId());
-
- String id = String.valueOf(nodeComponent.getComponentId()) + Const.ID_SPLIT + nodeComponent.getPeerId();
-
- nodeComponent.setId(id);
- nodeComponents.add(nodeComponent);
- }
-
- @Override
- public void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- NodeComponent nodeComponent = new NodeComponent(Const.EMPTY_STRING);
- nodeComponent.setComponentId(spanDecorator.getComponentId());
- nodeComponent.setPeerId(applicationId);
-
- String id = String.valueOf(nodeComponent.getComponentId()) + Const.ID_SPLIT + String.valueOf(applicationId);
- nodeComponent.setId(id);
-
- nodeComponents.add(nodeComponent);
- }
-
- @Override
- public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
- }
-
- @Override public void build() {
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.NODE_COMPONENT_GRAPH_ID, NodeComponent.class);
-
- nodeComponents.forEach(nodeComponent -> {
- nodeComponent.setId(timeBucket + Const.ID_SPLIT + nodeComponent.getId());
- nodeComponent.setTimeBucket(timeBucket);
- graph.start(nodeComponent);
- });
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingAggregationWorker.java
deleted file mode 100644
index b70b5424d365..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingAggregationWorker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.node;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.table.node.NodeMapping;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeMappingAggregationWorker extends AggregationWorker {
-
- public NodeMappingAggregationWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return NodeMappingAggregationWorker.class.hashCode();
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public NodeMappingAggregationWorker workerInstance(ModuleManager moduleManager) {
- return new NodeMappingAggregationWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingPersistenceWorker.java
deleted file mode 100644
index 5bf662bdb249..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingPersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.node;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.INodeMappingPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.node.NodeMapping;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeMappingPersistenceWorker extends PersistenceWorker {
-
- public NodeMappingPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return NodeMappingPersistenceWorker.class.hashCode();
- }
-
- @Override protected boolean needMergeDBData() {
- return true;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(INodeMappingPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public NodeMappingPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new NodeMappingPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingRemoteWorker.java
deleted file mode 100644
index 56a4f8734a30..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingRemoteWorker.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.node;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.remote.service.Selector;
-import org.skywalking.apm.collector.storage.table.node.NodeMapping;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeMappingRemoteWorker extends AbstractRemoteWorker {
-
- NodeMappingRemoteWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return NodeMappingRemoteWorker.class.hashCode();
- }
-
- @Override protected void onWork(NodeMapping nodeMapping) throws WorkerException {
- onNext(nodeMapping);
- }
-
- @Override public Selector selector() {
- return Selector.HashCode;
- }
-
- public static class Factory extends AbstractRemoteWorkerProvider {
- public Factory(ModuleManager moduleManager, RemoteSenderService remoteSenderService, int graphId) {
- super(moduleManager, remoteSenderService, graphId);
- }
-
- @Override public NodeMappingRemoteWorker workerInstance(ModuleManager moduleManager) {
- return new NodeMappingRemoteWorker(moduleManager);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingSpanListener.java
deleted file mode 100644
index e42275d9800f..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/node/NodeMappingSpanListener.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.node;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.FirstSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.RefsListener;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.ReferenceDecorator;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.node.NodeMapping;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeMappingSpanListener implements RefsListener, FirstSpanListener {
-
- private final Logger logger = LoggerFactory.getLogger(NodeMappingSpanListener.class);
-
- private List nodeMappings = new ArrayList<>();
- private long timeBucket;
-
- @Override public void parseRef(ReferenceDecorator referenceDecorator, int applicationId, int instanceId,
- String segmentId) {
- logger.debug("node mapping listener parse reference");
- NodeMapping nodeMapping = new NodeMapping(Const.EMPTY_STRING);
- nodeMapping.setApplicationId(applicationId);
- nodeMapping.setAddressId(referenceDecorator.getNetworkAddressId());
- String id = String.valueOf(applicationId) + Const.ID_SPLIT + String.valueOf(nodeMapping.getAddressId());
- nodeMapping.setId(id);
- nodeMappings.add(nodeMapping);
- }
-
- @Override
- public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
- }
-
- @Override public void build() {
- logger.debug("node mapping listener build");
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.NODE_MAPPING_GRAPH_ID, NodeMapping.class);
-
- for (NodeMapping nodeMapping : nodeMappings) {
- nodeMapping.setId(timeBucket + Const.ID_SPLIT + nodeMapping.getId());
- nodeMapping.setTimeBucket(timeBucket);
- logger.debug("push to node mapping aggregation worker, id: {}", nodeMapping.getId());
- graph.start(nodeMapping);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceAggregationWorker.java
deleted file mode 100644
index 9b31560656ad..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceAggregationWorker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.noderef;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.table.noderef.NodeReference;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeReferenceAggregationWorker extends AggregationWorker {
-
- public NodeReferenceAggregationWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return NodeReferenceAggregationWorker.class.hashCode();
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public NodeReferenceAggregationWorker workerInstance(ModuleManager moduleManager) {
- return new NodeReferenceAggregationWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferencePersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferencePersistenceWorker.java
deleted file mode 100644
index f03d8ec1eb7d..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferencePersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.noderef;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.INodeReferencePersistenceDAO;
-import org.skywalking.apm.collector.storage.table.noderef.NodeReference;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeReferencePersistenceWorker extends PersistenceWorker {
-
- public NodeReferencePersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return 0;
- }
-
- @Override protected boolean needMergeDBData() {
- return true;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(INodeReferencePersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public NodeReferencePersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new NodeReferencePersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceRemoteWorker.java
deleted file mode 100644
index a06dcc133b16..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceRemoteWorker.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.noderef;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.remote.service.Selector;
-import org.skywalking.apm.collector.storage.table.noderef.NodeReference;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeReferenceRemoteWorker extends AbstractRemoteWorker {
-
- NodeReferenceRemoteWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return NodeReferenceRemoteWorker.class.hashCode();
- }
-
- @Override protected void onWork(NodeReference nodeReference) throws WorkerException {
- onNext(nodeReference);
- }
-
- @Override public Selector selector() {
- return Selector.HashCode;
- }
-
- public static class Factory extends AbstractRemoteWorkerProvider {
- public Factory(ModuleManager moduleManager, RemoteSenderService remoteSenderService, int graphId) {
- super(moduleManager, remoteSenderService, graphId);
- }
-
- @Override public NodeReferenceRemoteWorker workerInstance(ModuleManager moduleManager) {
- return new NodeReferenceRemoteWorker(moduleManager);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceSpanListener.java
deleted file mode 100644
index 4ea030d438b4..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/noderef/NodeReferenceSpanListener.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.noderef;
-
-import java.util.LinkedList;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.EntrySpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.ExitSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.RefsListener;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.ReferenceDecorator;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.InstanceCacheService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.CollectionUtils;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.noderef.NodeReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class NodeReferenceSpanListener implements EntrySpanListener, ExitSpanListener, RefsListener {
-
- private final Logger logger = LoggerFactory.getLogger(NodeReferenceSpanListener.class);
-
- private final InstanceCacheService instanceCacheService;
- private final List nodeReferences;
- private final List references;
-
- public NodeReferenceSpanListener(ModuleManager moduleManager) {
- this.nodeReferences = new LinkedList<>();
- this.references = new LinkedList<>();
- this.instanceCacheService = moduleManager.find(CacheModule.NAME).getService(InstanceCacheService.class);
- }
-
- @Override
- public void parseExit(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) {
- NodeReference nodeReference = new NodeReference(Const.EMPTY_STRING);
- nodeReference.setFrontApplicationId(applicationId);
- nodeReference.setBehindApplicationId(spanDecorator.getPeerId());
- nodeReference.setTimeBucket(TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()));
-
- StringBuilder idBuilder = new StringBuilder();
- idBuilder.append(nodeReference.getTimeBucket()).append(Const.ID_SPLIT).append(applicationId)
- .append(Const.ID_SPLIT).append(spanDecorator.getPeerId());
-
- nodeReference.setId(idBuilder.toString());
- nodeReferences.add(buildNodeRefSum(nodeReference, spanDecorator.getStartTime(), spanDecorator.getEndTime(), spanDecorator.getIsError()));
- }
-
- @Override
- public void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- if (CollectionUtils.isNotEmpty(references)) {
- references.forEach(nodeReference -> {
- nodeReference.setTimeBucket(TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()));
- String idBuilder = String.valueOf(nodeReference.getTimeBucket()) + Const.ID_SPLIT + nodeReference.getFrontApplicationId() +
- Const.ID_SPLIT + nodeReference.getBehindApplicationId();
-
- nodeReference.setId(idBuilder);
- nodeReferences.add(buildNodeRefSum(nodeReference, spanDecorator.getStartTime(), spanDecorator.getEndTime(), spanDecorator.getIsError()));
- });
- } else {
- NodeReference nodeReference = new NodeReference(Const.EMPTY_STRING);
- nodeReference.setFrontApplicationId(Const.USER_ID);
- nodeReference.setBehindApplicationId(applicationId);
- nodeReference.setTimeBucket(TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime()));
-
- String idBuilder = String.valueOf(nodeReference.getTimeBucket()) + Const.ID_SPLIT + nodeReference.getFrontApplicationId() +
- Const.ID_SPLIT + nodeReference.getBehindApplicationId();
-
- nodeReference.setId(idBuilder);
- nodeReferences.add(buildNodeRefSum(nodeReference, spanDecorator.getStartTime(), spanDecorator.getEndTime(), spanDecorator.getIsError()));
- }
- }
-
- @Override public void parseRef(ReferenceDecorator referenceDecorator, int applicationId, int instanceId,
- String segmentId) {
- int parentApplicationId = instanceCacheService.get(referenceDecorator.getParentApplicationInstanceId());
-
- NodeReference referenceSum = new NodeReference(Const.EMPTY_STRING);
- referenceSum.setFrontApplicationId(parentApplicationId);
- referenceSum.setBehindApplicationId(applicationId);
- references.add(referenceSum);
- }
-
- @Override public void build() {
- logger.debug("node reference summary listener build");
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.NODE_REFERENCE_GRAPH_ID, NodeReference.class);
- for (NodeReference nodeReference : nodeReferences) {
- graph.start(nodeReference);
- }
- }
-
- private NodeReference buildNodeRefSum(NodeReference reference,
- long startTime, long endTime, boolean isError) {
- long cost = endTime - startTime;
- if (cost <= 1000 && !isError) {
- reference.setS1Lte(1);
- } else if (1000 < cost && cost <= 3000 && !isError) {
- reference.setS3Lte(1);
- } else if (3000 < cost && cost <= 5000 && !isError) {
- reference.setS5Lte(1);
- } else if (5000 < cost && !isError) {
- reference.setS5Gt(1);
- } else {
- reference.setError(1);
- }
- reference.setSummary(1);
- return reference;
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentCostPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentCostPersistenceWorker.java
deleted file mode 100644
index ec6c4c2ea992..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentCostPersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.segment;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.ISegmentCostPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.segment.SegmentCost;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentCostPersistenceWorker extends PersistenceWorker {
-
- public SegmentCostPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return SegmentCostPersistenceWorker.class.hashCode();
- }
-
- @Override protected boolean needMergeDBData() {
- return false;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(ISegmentCostPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public SegmentCostPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new SegmentCostPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentCostSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentCostSpanListener.java
deleted file mode 100644
index edd68f6522a2..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentCostSpanListener.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.segment;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.EntrySpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.ExitSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.FirstSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.LocalSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.ServiceNameCacheService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.segment.SegmentCost;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentCostSpanListener implements EntrySpanListener, ExitSpanListener, LocalSpanListener, FirstSpanListener {
-
- private final Logger logger = LoggerFactory.getLogger(SegmentCostSpanListener.class);
-
- private final List segmentCosts;
- private final ServiceNameCacheService serviceNameCacheService;
- private boolean isError = false;
- private long timeBucket;
-
- public SegmentCostSpanListener(ModuleManager moduleManager) {
- this.segmentCosts = new ArrayList<>();
- this.serviceNameCacheService = moduleManager.find(CacheModule.NAME).getService(ServiceNameCacheService.class);
- }
-
- @Override
- public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
-
- SegmentCost segmentCost = new SegmentCost(Const.EMPTY_STRING);
- segmentCost.setSegmentId(segmentId);
- segmentCost.setApplicationId(applicationId);
- segmentCost.setCost(spanDecorator.getEndTime() - spanDecorator.getStartTime());
- segmentCost.setStartTime(spanDecorator.getStartTime());
- segmentCost.setEndTime(spanDecorator.getEndTime());
- segmentCost.setId(segmentId);
- if (spanDecorator.getOperationNameId() == 0) {
- segmentCost.setServiceName(spanDecorator.getOperationName());
- } else {
- segmentCost.setServiceName(serviceNameCacheService.getSplitServiceName(serviceNameCacheService.get(spanDecorator.getOperationNameId())));
- }
-
- segmentCosts.add(segmentCost);
- isError = isError || spanDecorator.getIsError();
- }
-
- @Override
- public void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- isError = isError || spanDecorator.getIsError();
- }
-
- @Override
- public void parseExit(SpanDecorator spanDecorator, int applicationId, int instanceId, String segmentId) {
- isError = isError || spanDecorator.getIsError();
- }
-
- @Override
- public void parseLocal(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- isError = isError || spanDecorator.getIsError();
- }
-
- @Override public void build() {
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.SEGMENT_COST_GRAPH_ID, SegmentCost.class);
- logger.debug("segment cost listener build");
- for (SegmentCost segmentCost : segmentCosts) {
- segmentCost.setIsError(isError);
- segmentCost.setTimeBucket(timeBucket);
- graph.start(segmentCost);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentPersistenceWorker.java
deleted file mode 100644
index 79f70cc537b9..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/segment/SegmentPersistenceWorker.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.segment;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.ISegmentPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.segment.Segment;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class SegmentPersistenceWorker extends PersistenceWorker {
-
- public SegmentPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return 0;
- }
-
- @Override protected boolean needMergeDBData() {
- return false;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(ISegmentPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public SegmentPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new SegmentPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryAggregationWorker.java
deleted file mode 100644
index 840de19e0045..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryAggregationWorker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.service;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceEntryAggregationWorker extends AggregationWorker {
-
- public ServiceEntryAggregationWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return ServiceEntryAggregationWorker.class.hashCode();
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public ServiceEntryAggregationWorker workerInstance(ModuleManager moduleManager) {
- return new ServiceEntryAggregationWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryPersistenceWorker.java
deleted file mode 100644
index f40d55b6e04d..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryPersistenceWorker.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.service;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.IServiceEntryPersistenceDAO;
-import org.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceEntryPersistenceWorker extends PersistenceWorker {
-
- public ServiceEntryPersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return 0;
- }
-
- @Override protected boolean needMergeDBData() {
- return true;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(IServiceEntryPersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public ServiceEntryPersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new ServiceEntryPersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryRemoteWorker.java
deleted file mode 100644
index 6265f458ea50..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntryRemoteWorker.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.service;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.remote.service.Selector;
-import org.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceEntryRemoteWorker extends AbstractRemoteWorker {
-
- public ServiceEntryRemoteWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return ServiceEntryRemoteWorker.class.hashCode();
- }
-
- @Override protected void onWork(ServiceEntry serviceEntry) throws WorkerException {
- onNext(serviceEntry);
- }
-
- @Override public Selector selector() {
- return Selector.HashCode;
- }
-
- public static class Factory extends AbstractRemoteWorkerProvider {
-
- public Factory(ModuleManager moduleManager, RemoteSenderService remoteSenderService, int graphId) {
- super(moduleManager, remoteSenderService, graphId);
- }
-
- @Override public ServiceEntryRemoteWorker workerInstance(ModuleManager moduleManager) {
- return new ServiceEntryRemoteWorker(moduleManager);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntrySpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntrySpanListener.java
deleted file mode 100644
index 1540fcf89fdd..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/service/ServiceEntrySpanListener.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.service;
-
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.EntrySpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.FirstSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.RefsListener;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.ReferenceDecorator;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.service.ServiceNameCacheService;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.service.ServiceEntry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceEntrySpanListener implements RefsListener, FirstSpanListener, EntrySpanListener {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceEntrySpanListener.class);
-
- private long timeBucket;
- private boolean hasReference = false;
- private int applicationId;
- private int entryServiceId;
- private String entryServiceName;
- private boolean hasEntry = false;
- private final ServiceNameCacheService serviceNameCacheService;
-
- public ServiceEntrySpanListener(ModuleManager moduleManager) {
- this.serviceNameCacheService = moduleManager.find(CacheModule.NAME).getService(ServiceNameCacheService.class);
- }
-
- @Override
- public void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- this.applicationId = applicationId;
- this.entryServiceId = spanDecorator.getOperationNameId();
- this.entryServiceName = serviceNameCacheService.getSplitServiceName(serviceNameCacheService.get(entryServiceId));
- this.hasEntry = true;
- }
-
- @Override public void parseRef(ReferenceDecorator referenceDecorator, int applicationId, int instanceId,
- String segmentId) {
- hasReference = true;
- }
-
- @Override
- public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
- }
-
- @Override public void build() {
- logger.debug("entry service listener build");
- if (!hasReference && hasEntry) {
- ServiceEntry serviceEntry = new ServiceEntry(applicationId + Const.ID_SPLIT + entryServiceId);
- serviceEntry.setApplicationId(applicationId);
- serviceEntry.setEntryServiceId(entryServiceId);
- serviceEntry.setEntryServiceName(entryServiceName);
- serviceEntry.setRegisterTime(timeBucket);
- serviceEntry.setNewestTime(timeBucket);
-
- logger.debug("push to service entry aggregation worker, id: {}", serviceEntry.getId());
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.SERVICE_ENTRY_GRAPH_ID, ServiceEntry.class);
- graph.start(serviceEntry);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceAggregationWorker.java
deleted file mode 100644
index 9f00ea3957fe..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceAggregationWorker.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.serviceref;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.table.serviceref.ServiceReference;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceReferenceAggregationWorker extends AggregationWorker {
-
- public ServiceReferenceAggregationWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return ServiceReferenceAggregationWorker.class.hashCode();
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public ServiceReferenceAggregationWorker workerInstance(ModuleManager moduleManager) {
- return new ServiceReferenceAggregationWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferencePersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferencePersistenceWorker.java
deleted file mode 100644
index 13a72965aa6f..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferencePersistenceWorker.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.serviceref;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.queue.service.QueueCreatorService;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.dao.IServiceReferencePersistenceDAO;
-import org.skywalking.apm.collector.storage.table.serviceref.ServiceReference;
-import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceReferencePersistenceWorker extends PersistenceWorker {
-
- public ServiceReferencePersistenceWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return 0;
- }
-
- @Override protected boolean needMergeDBData() {
- return true;
- }
-
- @Override protected IPersistenceDAO persistenceDAO() {
- return getModuleManager().find(StorageModule.NAME).getService(IServiceReferencePersistenceDAO.class);
- }
-
- public static class Factory extends AbstractLocalAsyncWorkerProvider {
-
- public Factory(ModuleManager moduleManager, QueueCreatorService queueCreatorService) {
- super(moduleManager, queueCreatorService);
- }
-
- @Override public ServiceReferencePersistenceWorker workerInstance(ModuleManager moduleManager) {
- return new ServiceReferencePersistenceWorker(moduleManager);
- }
-
- @Override
- public int queueSize() {
- return 1024;
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceRemoteWorker.java
deleted file mode 100644
index 4582a25220a7..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceRemoteWorker.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.serviceref;
-
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.remote.service.RemoteSenderService;
-import org.skywalking.apm.collector.remote.service.Selector;
-import org.skywalking.apm.collector.storage.table.serviceref.ServiceReference;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker;
-import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider;
-import org.skywalking.apm.collector.stream.worker.base.WorkerException;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceReferenceRemoteWorker extends AbstractRemoteWorker {
-
- public ServiceReferenceRemoteWorker(ModuleManager moduleManager) {
- super(moduleManager);
- }
-
- @Override public int id() {
- return ServiceReferenceRemoteWorker.class.hashCode();
- }
-
- @Override protected void onWork(ServiceReference serviceReference) throws WorkerException {
- onNext(serviceReference);
- }
-
- @Override public Selector selector() {
- return Selector.HashCode;
- }
-
- public static class Factory extends AbstractRemoteWorkerProvider {
-
- public Factory(ModuleManager moduleManager, RemoteSenderService remoteSenderService, int graphId) {
- super(moduleManager, remoteSenderService, graphId);
- }
-
- @Override public ServiceReferenceRemoteWorker workerInstance(ModuleManager moduleManager) {
- return new ServiceReferenceRemoteWorker(moduleManager);
- }
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceSpanListener.java
deleted file mode 100644
index 9c8256d742f5..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/serviceref/ServiceReferenceSpanListener.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.agent.stream.worker.trace.serviceref;
-
-import java.util.LinkedList;
-import java.util.List;
-import org.skywalking.apm.collector.agent.stream.graph.TraceStreamGraph;
-import org.skywalking.apm.collector.agent.stream.parser.EntrySpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.FirstSpanListener;
-import org.skywalking.apm.collector.agent.stream.parser.RefsListener;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.ReferenceDecorator;
-import org.skywalking.apm.collector.agent.stream.parser.standardization.SpanDecorator;
-import org.skywalking.apm.collector.core.graph.Graph;
-import org.skywalking.apm.collector.core.graph.GraphManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.TimeBucketUtils;
-import org.skywalking.apm.collector.storage.table.serviceref.ServiceReference;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceReferenceSpanListener implements FirstSpanListener, EntrySpanListener, RefsListener {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceReferenceSpanListener.class);
-
- private List referenceServices = new LinkedList<>();
- private int serviceId = 0;
- private long startTime = 0;
- private long endTime = 0;
- private boolean isError = false;
- private long timeBucket;
- private boolean hasEntry = false;
-
- @Override
- public void parseFirst(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- timeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(spanDecorator.getStartTime());
- }
-
- @Override public void parseRef(ReferenceDecorator referenceDecorator, int applicationId, int applicationInstanceId,
- String segmentId) {
- referenceServices.add(referenceDecorator);
- }
-
- @Override
- public void parseEntry(SpanDecorator spanDecorator, int applicationId, int instanceId,
- String segmentId) {
- serviceId = spanDecorator.getOperationNameId();
- startTime = spanDecorator.getStartTime();
- endTime = spanDecorator.getEndTime();
- isError = spanDecorator.getIsError();
- this.hasEntry = true;
- }
-
- private void calculateCost(ServiceReference serviceReference, long startTime,
- long endTime, boolean isError) {
- long cost = endTime - startTime;
- if (cost <= 1000 && !isError) {
- serviceReference.setS1Lte(1L);
- } else if (1000 < cost && cost <= 3000 && !isError) {
- serviceReference.setS3Lte(1L);
- } else if (3000 < cost && cost <= 5000 && !isError) {
- serviceReference.setS5Lte(1L);
- } else if (5000 < cost && !isError) {
- serviceReference.setS5Gt(1L);
- } else {
- serviceReference.setError(1L);
- }
- serviceReference.setSummary(1L);
- serviceReference.setCostSummary(cost);
- }
-
- @Override public void build() {
- logger.debug("service reference listener build");
- if (hasEntry) {
- if (referenceServices.size() > 0) {
- referenceServices.forEach(reference -> {
- ServiceReference serviceReference = new ServiceReference(Const.EMPTY_STRING);
- int entryServiceId = reference.getEntryServiceId();
- int frontServiceId = reference.getParentServiceId();
- int behindServiceId = serviceId;
- calculateCost(serviceReference, startTime, endTime, isError);
-
- logger.debug("has reference, entryServiceId: {}", entryServiceId);
- sendToAggregationWorker(serviceReference, entryServiceId, frontServiceId, behindServiceId);
- });
- } else {
- ServiceReference serviceReference = new ServiceReference(Const.EMPTY_STRING);
- int entryServiceId = serviceId;
- int frontServiceId = Const.NONE_SERVICE_ID;
- int behindServiceId = serviceId;
-
- calculateCost(serviceReference, startTime, endTime, isError);
- sendToAggregationWorker(serviceReference, entryServiceId, frontServiceId, behindServiceId);
- }
- }
- }
-
- private void sendToAggregationWorker(ServiceReference serviceReference, int entryServiceId, int frontServiceId,
- int behindServiceId) {
- StringBuilder idBuilder = new StringBuilder();
- idBuilder.append(timeBucket).append(Const.ID_SPLIT);
-
- idBuilder.append(entryServiceId).append(Const.ID_SPLIT);
- serviceReference.setEntryServiceId(entryServiceId);
-
- idBuilder.append(frontServiceId).append(Const.ID_SPLIT);
- serviceReference.setFrontServiceId(frontServiceId);
-
- idBuilder.append(behindServiceId);
- serviceReference.setBehindServiceId(behindServiceId);
-
- serviceReference.setId(idBuilder.toString());
- serviceReference.setTimeBucket(timeBucket);
- logger.debug("push to service reference aggregation worker, id: {}", serviceReference.getId());
-
- Graph graph = GraphManager.INSTANCE.createIfAbsent(TraceStreamGraph.SERVICE_REFERENCE_GRAPH_ID, ServiceReference.class);
- graph.start(serviceReference);
- }
-}
diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
deleted file mode 100644
index 134461a3b69e..000000000000
--- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.agent.stream.AgentStreamModuleProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-agent-stream/pom.xml b/apm-collector/apm-collector-agent-stream/pom.xml
deleted file mode 100644
index f1a564bf1ebc..000000000000
--- a/apm-collector/apm-collector-agent-stream/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-agent-stream
- pom
-
- collector-agent-stream-define
- collector-agent-stream-provider
-
-
-
-
- org.skywalking
- apm-collector-core
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml b/apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml
deleted file mode 100644
index 956d41523f90..000000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
- apm-collector-baseline
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-baseline-computing-define
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/java/org/skywalking/apm/collector/baseline/computing/ComputingModule.java b/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/java/org/skywalking/apm/collector/baseline/computing/ComputingModule.java
deleted file mode 100644
index c90c059854ef..000000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/java/org/skywalking/apm/collector/baseline/computing/ComputingModule.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.baseline.computing;
-
-import org.skywalking.apm.collector.core.module.Module;
-
-/**
- * The ComputingModule defines the required service interfaces.
- *
- * @author wu-sheng
- */
-public class ComputingModule extends Module {
- public static final String NAME = "baseline-computing";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class[] services() {
- return new Class[0];
- }
-}
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module
deleted file mode 100644
index bca5d350395d..000000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-define/src/main/resources/services/org.skywalking.apm.collector.core.module.Module
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.baseline.computing.ComputingModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml b/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml
deleted file mode 100644
index ad9b9d61ec57..000000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
- apm-collector-baseline
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-baseline-computing-provider
-
-
-
- org.skywalking
- collector-baseline-computing-define
- ${project.version}
-
-
- org.skywalking
- collector-baseline-computing-define
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/java/org/skywalking/collector/baseline/computing/provider/ComputingProvider.java b/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/java/org/skywalking/collector/baseline/computing/provider/ComputingProvider.java
deleted file mode 100644
index e81124dbac47..000000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/java/org/skywalking/collector/baseline/computing/provider/ComputingProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.collector.baseline.computing.provider;
-
-import java.util.Properties;
-import org.skywalking.apm.collector.baseline.computing.ComputingModule;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.ModuleProvider;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-
-/**
- * The ComputingProvider is the default implementation of {@link ComputingModule}
- *
- * @author wu-sheng
- */
-public class ComputingProvider extends ModuleProvider {
- public static final String NAME = "default";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class module() {
- return ComputingModule.class;
- }
-
- @Override public void prepare(Properties config) throws ServiceNotProvidedException {
-
- }
-
- @Override public void start(Properties config) throws ServiceNotProvidedException {
-
- }
-
- @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
-
- }
-
- @Override public String[] requiredModules() {
- return new String[0];
- }
-}
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider
deleted file mode 100644
index d31a7818a1dc..000000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-computing-provider/src/main/resources/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.collector.baseline.computing.provider.ComputingProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml b/apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml
deleted file mode 100644
index 5a0cc49bf031..000000000000
--- a/apm-collector/apm-collector-baseline/collector-baseline-scheduler-define/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
- apm-collector-baseline
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-baseline-scheduler-define
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-baseline/pom.xml b/apm-collector/apm-collector-baseline/pom.xml
deleted file mode 100644
index 7c9c051405b0..000000000000
--- a/apm-collector/apm-collector-baseline/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-baseline
- pom
-
- collector-baseline-computing-define
- collector-baseline-computing-provider
- collector-baseline-scheduler-define
-
-
-
-
- org.skywalking
- apm-collector-core
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-boot/bin/collectorService.bat b/apm-collector/apm-collector-boot/bin/collectorService.bat
deleted file mode 100644
index 08660014c04c..000000000000
--- a/apm-collector/apm-collector-boot/bin/collectorService.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-setlocal
-set COLLECTOR_PROCESS_TITLE=Skywalking-Collector
-set COLLECTOR_HOME=%~dp0%..
-set COLLECTOR_OPTS="-Xms256M -Xmx512M -Dcollector.logDir=%COLLECTOR_HOME%\logs"
-
-set CLASSPATH=%COLLECTOR_HOME%\config;.;
-set CLASSPATH=%COLLECTOR_HOME%\libs\*;%CLASSPATH%
-
-if defined JAVA_HOME (
- set _EXECJAVA="%JAVA_HOME:"=%"\bin\java
-)
-
-if not defined JAVA_HOME (
- echo "JAVA_HOME not set."
- set _EXECJAVA=java
-)
-
-start "%COLLECTOR_PROCESS_TITLE%" %_EXECJAVA% "%COLLECTOR_OPTS%" -cp "%CLASSPATH%" org.skywalking.apm.collector.boot.CollectorBootStartUp
-endlocal
diff --git a/apm-collector/apm-collector-boot/bin/collectorService.sh b/apm-collector/apm-collector-boot/bin/collectorService.sh
deleted file mode 100644
index 05e1f17d0ccc..000000000000
--- a/apm-collector/apm-collector-boot/bin/collectorService.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env sh
-
-PRG="$0"
-PRGDIR=`dirname "$PRG"`
-[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-COLLECT_LOG_DIR="${COLLECTOR_HOME}/logs"
-JAVA_OPTS=" -Xms256M -Xmx512M"
-
-if [ ! -d "${COLLECTOR_HOME}/logs" ]; then
- mkdir -p "${COLLECT_LOG_DIR}"
-fi
-
-_RUNJAVA=${JAVA_HOME}/bin/java
-[ -z "$JAVA_HOME" ] && _RUNJAVA=java
-
-CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH"
-for i in "$COLLECTOR_HOME"/libs/*.jar
-do
- CLASSPATH="$i:$CLASSPATH"
-done
-
-COLLECTOR_OPTIONS=" -Dcollector.logDir=${COLLECT_LOG_DIR}"
-
-eval exec "\"$_RUNJAVA\" ${JAVA_OPTS} ${COLLECTOR_OPTIONS} -classpath $CLASSPATH org.skywalking.apm.collector.boot.CollectorBootStartUp \
- 2>${COLLECT_LOG_DIR}/collector.log 1> /dev/null &"
-
-if [ $? -eq 0 ]; then
- sleep 1
- echo "Skywalking Web started successfully!"
-else
- echo "Skywalking Web started failure!"
- exit 1
-fi
diff --git a/apm-collector/apm-collector-boot/bin/startup.bat b/apm-collector/apm-collector-boot/bin/startup.bat
deleted file mode 100644
index d1f9f401d0c4..000000000000
--- a/apm-collector/apm-collector-boot/bin/startup.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-@echo off
-
-setlocal
-call "%~dp0"\collectorService.bat start
-endlocal
diff --git a/apm-collector/apm-collector-boot/bin/startup.sh b/apm-collector/apm-collector-boot/bin/startup.sh
deleted file mode 100644
index d8f441aa7667..000000000000
--- a/apm-collector/apm-collector-boot/bin/startup.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-PRG="$0"
-PRGDIR=`dirname "$PRG"`
-EXECUTABLE=collectorService.sh
-
-exec "$PRGDIR"/"$EXECUTABLE" start
diff --git a/apm-collector/apm-collector-boot/docker/Dockerfile b/apm-collector/apm-collector-boot/docker/Dockerfile
deleted file mode 100644
index bfc1dcad98ee..000000000000
--- a/apm-collector/apm-collector-boot/docker/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM openjdk:8u111-jdk
-
-ENV ZK_ADDRESSES=127.0.0.1:2181 \
- ES_CLUSTER_NAME=CollectorDBCluster \
- ES_ADDRESSES=localhost:9300 \
- BIND_HOST=localhost \
- NAMING_BIND_HOST=localhost \
- NAMING_BIND_PORT=10800 \
- REMOTE_BIND_PORT=11800 \
- AGENT_GRPC_BIND_PORT=11800 \
- AGENT_JETTY_BIND_HOST=localhost \
- AGENT_JETTY_BIND_PORT=12800 \
- UI_JETTY_BIND_PORT=12800 \
- UI_JETTY_BIND_HOST=localhost
-
-ADD skywalking-collector.tar.gz /usr/local
-COPY collectorService.sh /usr/local/skywalking-collector/bin
-COPY log4j2.xml /usr/local/skywalking-collector/config
-COPY application.yml /usr/local/skywalking-collector/config
-COPY docker-entrypoint.sh /
-
-RUN chmod +x /usr/local/skywalking-collector/bin/collectorService.sh && chmod +x /docker-entrypoint.sh
-
-EXPOSE 10800
-EXPOSE 11800
-EXPOSE 12800
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["/usr/local/skywalking-collector/bin/collectorService.sh"]
diff --git a/apm-collector/apm-collector-boot/docker/application.yml b/apm-collector/apm-collector-boot/docker/application.yml
deleted file mode 100644
index d3b4f3c74a18..000000000000
--- a/apm-collector/apm-collector-boot/docker/application.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-cluster:
- zookeeper:
- hostPort: {ZK_ADDRESSES}
- sessionTimeout: 100000
-naming:
- jetty:
- host: {NAMING_BIND_HOST}
- port: {NAMING_BIND_PORT}
- context_path: /
-remote:
- gRPC:
- host: {BIND_HOST}
- port: {REMOTE_BIND_PORT}
-agent_gRPC:
- gRPC:
- host: {BIND_HOST}
- port: {AGENT_GRPC_BIND_PORT}
-agent_jetty:
- jetty:
- host: {AGENT_JETTY_BIND_HOST}
- port: {AGENT_JETTY_BIND_PORT}
- context_path: /
-agent_stream:
- default:
- buffer_file_path: ../buffer/
- buffer_offset_max_file_size: 10M
- buffer_segment_max_file_size: 500M
-ui:
- jetty:
- host: {UI_JETTY_BIND_HOST}
- port: {UI_JETTY_BIND_PORT}
- context_path: /
-storage:
- elasticsearch:
- cluster_name: {ES_CLUSTER_NAME}
- cluster_transport_sniffer: true
- cluster_nodes: {ES_ADDRESSES}
- index_shards_number: 2
- index_replicas_number: 0
- ttl: 7
diff --git a/apm-collector/apm-collector-boot/docker/collectorService.sh b/apm-collector/apm-collector-boot/docker/collectorService.sh
deleted file mode 100644
index 919015eee5a5..000000000000
--- a/apm-collector/apm-collector-boot/docker/collectorService.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env sh
-
-PRG="$0"
-PRGDIR=`dirname "$PRG"`
-[ -z "$COLLECTOR_HOME" ] && COLLECTOR_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-
-COLLECT_LOG_DIR="${COLLECTOR_HOME}/logs"
-JAVA_OPTS=" -Xms256M -Xmx512M"
-
-if [ ! -d "${COLLECTOR_HOME}/logs" ]; then
- mkdir -p "${COLLECT_LOG_DIR}"
-fi
-
-_RUNJAVA=${JAVA_HOME}/bin/java
-[ -z "$JAVA_HOME" ] && _RUNJAVA=java
-
-CLASSPATH="$COLLECTOR_HOME/config:$CLASSPATH"
-for i in "$COLLECTOR_HOME"/libs/*.jar
-do
- CLASSPATH="$i:$CLASSPATH"
-done
-
-${_RUNJAVA} ${JAVA_OPTS} -classpath $CLASSPATH org.skywalking.apm.collector.boot.CollectorBootStartUp
diff --git a/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh b/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
deleted file mode 100644
index ab9fe8e7e09b..000000000000
--- a/apm-collector/apm-collector-boot/docker/docker-entrypoint.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-echo "replace {ZK_ADDRESSES} to ${ZK_ADDRESSES}"
-eval sed -i -e 's/\{ZK_ADDRESSES\}/${ZK_ADDRESSES}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {ES_CLUSTER_NAME} to ${ES_CLUSTER_NAME}"
-eval sed -i -e 's/\{ES_CLUSTER_NAME\}/${ES_CLUSTER_NAME}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {ES_ADDRESSES} to ${ES_ADDRESSES}"
-eval sed -i -e 's/\{ES_ADDRESSES\}/${ES_ADDRESSES}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {BIND_HOST} to ${BIND_HOST}"
-eval sed -i -e 's/\{BIND_HOST\}/${BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {NAMING_BIND_HOST} to ${NAMING_BIND_HOST}"
-eval sed -i -e 's/\{NAMING_BIND_HOST\}/${NAMING_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {NAMING_BIND_PORT} to ${NAMING_BIND_PORT}"
-eval sed -i -e 's/\{NAMING_BIND_PORT\}/${NAMING_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {REMOTE_BIND_PORT} to ${REMOTE_BIND_PORT}"
-eval sed -i -e 's/\{REMOTE_BIND_PORT\}/${REMOTE_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {AGENT_GRPC_BIND_PORT} to ${AGENT_GRPC_BIND_PORT}"
-eval sed -i -e 's/\{AGENT_GRPC_BIND_PORT\}/${AGENT_GRPC_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {AGENT_JETTY_BIND_HOST} to ${AGENT_JETTY_BIND_HOST}"
-eval sed -i -e 's/\{AGENT_JETTY_BIND_HOST\}/${AGENT_JETTY_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {AGENT_JETTY_BIND_PORT} to ${AGENT_JETTY_BIND_PORT}"
-eval sed -i -e 's/\{AGENT_JETTY_BIND_PORT\}/${AGENT_JETTY_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {UI_JETTY_BIND_PORT} to ${UI_JETTY_BIND_PORT}"
-eval sed -i -e 's/\{UI_JETTY_BIND_PORT\}/${UI_JETTY_BIND_PORT}/' /usr/local/skywalking-collector/config/application.yml
-
-echo "replace {UI_JETTY_BIND_HOST} to ${UI_JETTY_BIND_HOST}"
-eval sed -i -e 's/\{UI_JETTY_BIND_HOST\}/${UI_JETTY_BIND_HOST}/' /usr/local/skywalking-collector/config/application.yml
-
-
-exec "$@"
diff --git a/apm-collector/apm-collector-boot/docker/log4j2.xml b/apm-collector/apm-collector-boot/docker/log4j2.xml
deleted file mode 100644
index e6915ec9a548..000000000000
--- a/apm-collector/apm-collector-boot/docker/log4j2.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml
deleted file mode 100644
index caec74d40802..000000000000
--- a/apm-collector/apm-collector-boot/pom.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-
-
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-boot
- jar
-
-
- skywalking/skywalking-collector
- ${version}
-
-
-
-
- org.yaml
- snakeyaml
- 1.18
-
-
- org.skywalking
- apm-collector-core
- ${project.version}
-
-
-
- org.skywalking
- collector-cluster-redis-provider
- ${project.version}
-
-
- org.skywalking
- collector-cluster-standalone-provider
- ${project.version}
-
-
- org.skywalking
- collector-cluster-zookeeper-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-grpc-manager-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-jetty-manager-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-naming-jetty-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-agent-grpc-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-agent-jetty-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-agent-stream-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-ui-jetty-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-storage-es-provider
- ${project.version}
-
-
- org.skywalking
- collector-storage-h2-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-remote-grpc-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-queue-datacarrier-provider
- ${project.version}
-
-
- org.skywalking
- collector-queue-disruptor-provider
- ${project.version}
-
-
-
-
- org.skywalking
- collector-cache-guava-provider
- ${project.version}
-
-
-
-
-
- skywalking-collector
-
-
- maven-compiler-plugin
-
- ${compiler.version}
- ${compiler.version}
- ${project.build.sourceEncoding}
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.4.3
-
- ${project.build.sourceEncoding}
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.3.2
-
-
- application.yml
- log4j2.xml
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- assembly
- package
-
- single
-
-
-
- src/main/assembly/assembly.xml
-
- ${project.basedir}/../../packages
-
-
-
-
-
- com.spotify
- docker-maven-plugin
- ${docker.plugin.version}
-
- false
- ${docker.image.name}
-
- ${docker.image.version}
-
- ${project.basedir}/docker
-
-
- /
- ${project.basedir}/../../packages
- ${build.finalName}.tar.gz
-
-
-
-
-
-
-
diff --git a/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml b/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
deleted file mode 100644
index 683048fbf75b..000000000000
--- a/apm-collector/apm-collector-boot/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
- zip
- tar.gz
-
-
-
- /libs
- runtime
-
-
-
-
- ${project.basedir}/bin
- /bin
-
- *.sh
- *.bat
-
- 0755
-
-
- src/main/resources
- /config
-
- application.yml
-
-
-
- src/main/assembly
- /config
-
- log4j2.xml
-
-
-
- src/main/resources
-
- application.yml
- log4j2.xml
-
- /config
-
-
-
diff --git a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml b/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
deleted file mode 100644
index ffb1ef68e42c..000000000000
--- a/apm-collector/apm-collector-boot/src/main/assembly/log4j2.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
- ${sys:collector.logDir}
-
-
-
-
- %d - %c -%-4r [%t] %-5p %x - %m%n
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBootStartUp.java b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBootStartUp.java
deleted file mode 100644
index d747733a0d4a..000000000000
--- a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/CollectorBootStartUp.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.boot;
-
-import org.skywalking.apm.collector.boot.config.ApplicationConfigLoader;
-import org.skywalking.apm.collector.boot.config.ConfigFileNotFoundException;
-import org.skywalking.apm.collector.core.module.ApplicationConfiguration;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.module.ModuleNotFoundException;
-import org.skywalking.apm.collector.core.module.ProviderNotFoundException;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class CollectorBootStartUp {
-
- public static void main(String[] args) {
- final Logger logger = LoggerFactory.getLogger(CollectorBootStartUp.class);
-
- ApplicationConfigLoader configLoader = new ApplicationConfigLoader();
- ModuleManager manager = new ModuleManager();
- try {
- ApplicationConfiguration applicationConfiguration = configLoader.load();
- manager.init(applicationConfiguration);
- } catch (ConfigFileNotFoundException e) {
- logger.error(e.getMessage(), e);
- } catch (ModuleNotFoundException e) {
- logger.error(e.getMessage(), e);
- } catch (ProviderNotFoundException e) {
- logger.error(e.getMessage(), e);
- } catch (ServiceNotProvidedException e) {
- logger.error(e.getMessage(), e);
- }
-
- try {
- Thread.sleep(60000);
- } catch (InterruptedException e) {
- }
- }
-}
diff --git a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ApplicationConfigLoader.java b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ApplicationConfigLoader.java
deleted file mode 100644
index 4b6b6a77e375..000000000000
--- a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ApplicationConfigLoader.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.boot.config;
-
-import java.io.FileNotFoundException;
-import java.io.Reader;
-import java.util.Map;
-import java.util.Properties;
-import org.skywalking.apm.collector.core.module.ApplicationConfiguration;
-import org.skywalking.apm.collector.core.util.ResourceUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.Yaml;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationConfigLoader implements ConfigLoader {
-
- private final Logger logger = LoggerFactory.getLogger(ApplicationConfigLoader.class);
-
- private final Yaml yaml = new Yaml();
-
- @Override public ApplicationConfiguration load() throws ConfigFileNotFoundException {
- ApplicationConfiguration configuration = new ApplicationConfiguration();
- this.loadConfig(configuration);
- this.loadDefaultConfig(configuration);
- return configuration;
- }
-
- private void loadConfig(ApplicationConfiguration configuration) throws ConfigFileNotFoundException {
- try {
- Reader applicationReader = ResourceUtils.read("application.yml");
- Map>> moduleConfig = yaml.loadAs(applicationReader, Map.class);
- moduleConfig.forEach((moduleName, providerConfig) -> {
- if (providerConfig.size() > 0) {
- logger.info("Get a module define from application.yml, module name: {}", moduleName);
- ApplicationConfiguration.ModuleConfiguration moduleConfiguration = configuration.addModule(moduleName);
- providerConfig.forEach((name, propertiesConfig) -> {
- logger.info("Get a provider define belong to {} module, provider name: {}", moduleName, name);
- Properties properties = new Properties();
- if (propertiesConfig != null) {
- propertiesConfig.forEach((key, value) -> {
- properties.put(key, value);
- logger.info("The property with key: {}, value: {}, in {} provider", key, value, name);
- });
- }
- moduleConfiguration.addProviderConfiguration(name, properties);
- });
- } else {
- logger.warn("Get a module define from application.yml, but no provider define, use default, module name: {}", moduleName);
- }
- });
- } catch (FileNotFoundException e) {
- throw new ConfigFileNotFoundException(e.getMessage(), e);
- }
- }
-
- private void loadDefaultConfig(ApplicationConfiguration configuration) throws ConfigFileNotFoundException {
- try {
- Reader applicationReader = ResourceUtils.read("application-default.yml");
- Map>> moduleConfig = yaml.loadAs(applicationReader, Map.class);
- moduleConfig.forEach((moduleName, providerConfig) -> {
- if (!configuration.has(moduleName)) {
- logger.warn("The {} module did't define in application.yml, use default", moduleName);
- ApplicationConfiguration.ModuleConfiguration moduleConfiguration = configuration.addModule(moduleName);
- providerConfig.forEach((name, propertiesConfig) -> {
- Properties properties = new Properties();
- if (propertiesConfig != null) {
- propertiesConfig.forEach(properties::put);
- }
- moduleConfiguration.addProviderConfiguration(name, properties);
- });
- }
- });
- } catch (FileNotFoundException e) {
- throw new ConfigFileNotFoundException(e.getMessage(), e);
- }
- }
-}
diff --git a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ConfigFileNotFoundException.java b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ConfigFileNotFoundException.java
deleted file mode 100644
index 335ca7015fd8..000000000000
--- a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ConfigFileNotFoundException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.boot.config;
-
-import org.skywalking.apm.collector.core.CollectorException;
-
-/**
- * @author peng-yongsheng
- */
-public class ConfigFileNotFoundException extends CollectorException {
-
- public ConfigFileNotFoundException(String message) {
- super(message);
- }
-
- public ConfigFileNotFoundException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ConfigLoader.java b/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ConfigLoader.java
deleted file mode 100644
index ff089fc034e4..000000000000
--- a/apm-collector/apm-collector-boot/src/main/java/org/skywalking/apm/collector/boot/config/ConfigLoader.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.boot.config;
-
-/**
- * @author peng-yongsheng
- */
-public interface ConfigLoader {
- T load() throws ConfigFileNotFoundException;
-}
diff --git a/apm-collector/apm-collector-boot/src/main/resources/application.yml b/apm-collector/apm-collector-boot/src/main/resources/application.yml
deleted file mode 100644
index 2ba018472365..000000000000
--- a/apm-collector/apm-collector-boot/src/main/resources/application.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-#cluster:
-# zookeeper:
-# hostPort: localhost:2181
-# sessionTimeout: 100000
-naming:
- jetty:
- host: localhost
- port: 10800
- context_path: /
-remote:
- gRPC:
- host: localhost
- port: 11800
-agent_gRPC:
- gRPC:
- host: localhost
- port: 11800
-agent_jetty:
- jetty:
- host: localhost
- port: 12800
- context_path: /
-agent_stream:
- default:
- buffer_file_path: ../buffer/
- buffer_offset_max_file_size: 10M
- buffer_segment_max_file_size: 500M
-ui:
- jetty:
- host: localhost
- port: 12800
- context_path: /
-#storage:
-# elasticsearch:
-# cluster_name: CollectorDBCluster
-# cluster_transport_sniffer: true
-# cluster_nodes: localhost:9300
-# index_shards_number: 2
-# index_replicas_number: 0
-# ttl: 7
\ No newline at end of file
diff --git a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml b/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
deleted file mode 100644
index e6915ec9a548..000000000000
--- a/apm-collector/apm-collector-boot/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/apm-collector/apm-collector-cache/collector-cache-define/pom.xml b/apm-collector/apm-collector-cache/collector-cache-define/pom.xml
deleted file mode 100644
index a8747780dfe3..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-define/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
- apm-collector-cache
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-cache-define
- jar
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/CacheModule.java b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/CacheModule.java
deleted file mode 100644
index aed9cb7199a4..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/CacheModule.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache;
-
-import org.skywalking.apm.collector.cache.service.ApplicationCacheService;
-import org.skywalking.apm.collector.cache.service.InstanceCacheService;
-import org.skywalking.apm.collector.cache.service.ServiceIdCacheService;
-import org.skywalking.apm.collector.cache.service.ServiceNameCacheService;
-import org.skywalking.apm.collector.core.module.Module;
-
-/**
- * @author peng-yongsheng
- */
-public class CacheModule extends Module {
-
- public static final String NAME = "cache";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class[] services() {
- return new Class[] {ApplicationCacheService.class, InstanceCacheService.class, ServiceIdCacheService.class, ServiceNameCacheService.class};
- }
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ApplicationCacheService.java b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ApplicationCacheService.java
deleted file mode 100644
index 46fc477a5c81..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ApplicationCacheService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.service;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface ApplicationCacheService extends Service {
- int get(String applicationCode);
-
- String get(int applicationId);
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/InstanceCacheService.java b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/InstanceCacheService.java
deleted file mode 100644
index a4333040c3d8..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/InstanceCacheService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.service;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface InstanceCacheService extends Service {
- int get(int applicationInstanceId);
-
- int getInstanceId(int applicationId, String agentUUID);
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ServiceIdCacheService.java b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ServiceIdCacheService.java
deleted file mode 100644
index bd155c8e6ab4..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ServiceIdCacheService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.service;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface ServiceIdCacheService extends Service {
- int get(int applicationId, String serviceName);
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ServiceNameCacheService.java b/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ServiceNameCacheService.java
deleted file mode 100644
index 54de07605471..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-define/src/main/java/org/skywalking/apm/collector/cache/service/ServiceNameCacheService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.service;
-
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface ServiceNameCacheService extends Service {
- String get(int serviceId);
-
- String getSplitServiceName(String serviceName);
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
deleted file mode 100644
index 3f6af42aad02..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.cache.CacheModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml b/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
deleted file mode 100644
index b6233486e8a6..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
- apm-collector-cache
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-cache-guava-provider
- jar
-
-
-
- org.skywalking
- collector-cache-define
- ${project.version}
-
-
- com.google.guava
- guava
- 19.0
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/CacheModuleGuavaProvider.java b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/CacheModuleGuavaProvider.java
deleted file mode 100644
index fbfbc7cea111..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/CacheModuleGuavaProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.guava;
-
-import java.util.Properties;
-import org.skywalking.apm.collector.cache.CacheModule;
-import org.skywalking.apm.collector.cache.guava.service.ApplicationCacheGuavaService;
-import org.skywalking.apm.collector.cache.guava.service.InstanceCacheGuavaService;
-import org.skywalking.apm.collector.cache.guava.service.ServiceIdCacheGuavaService;
-import org.skywalking.apm.collector.cache.guava.service.ServiceNameCacheGuavaService;
-import org.skywalking.apm.collector.cache.service.ApplicationCacheService;
-import org.skywalking.apm.collector.cache.service.InstanceCacheService;
-import org.skywalking.apm.collector.cache.service.ServiceIdCacheService;
-import org.skywalking.apm.collector.cache.service.ServiceNameCacheService;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.ModuleProvider;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.skywalking.apm.collector.storage.StorageModule;
-
-/**
- * @author peng-yongsheng
- */
-public class CacheModuleGuavaProvider extends ModuleProvider {
-
- @Override public String name() {
- return "guava";
- }
-
- @Override public Class module() {
- return CacheModule.class;
- }
-
- @Override public void prepare(Properties config) throws ServiceNotProvidedException {
- this.registerServiceImplementation(ApplicationCacheService.class, new ApplicationCacheGuavaService(getManager()));
- this.registerServiceImplementation(InstanceCacheService.class, new InstanceCacheGuavaService(getManager()));
- this.registerServiceImplementation(ServiceIdCacheService.class, new ServiceIdCacheGuavaService(getManager()));
- this.registerServiceImplementation(ServiceNameCacheService.class, new ServiceNameCacheGuavaService(getManager()));
- }
-
- @Override public void start(Properties config) throws ServiceNotProvidedException {
- }
-
- @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
-
- }
-
- @Override public String[] requiredModules() {
- return new String[] {StorageModule.NAME};
- }
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ApplicationCacheGuavaService.java b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ApplicationCacheGuavaService.java
deleted file mode 100644
index 743390be9ba1..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ApplicationCacheGuavaService.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.guava.service;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import org.skywalking.apm.collector.cache.service.ApplicationCacheService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.core.util.StringUtils;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IApplicationCacheDAO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ApplicationCacheGuavaService implements ApplicationCacheService {
-
- private final Logger logger = LoggerFactory.getLogger(ApplicationCacheGuavaService.class);
-
- private final Cache codeCache = CacheBuilder.newBuilder().initialCapacity(100).maximumSize(1000).build();
-
- private final ModuleManager moduleManager;
- private IApplicationCacheDAO applicationCacheDAO;
-
- public ApplicationCacheGuavaService(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- }
-
- private IApplicationCacheDAO getApplicationCacheDAO() {
- if (ObjectUtils.isEmpty(applicationCacheDAO)) {
- this.applicationCacheDAO = moduleManager.find(StorageModule.NAME).getService(IApplicationCacheDAO.class);
- }
- return this.applicationCacheDAO;
- }
-
- public int get(String applicationCode) {
- int applicationId = 0;
- try {
- applicationId = codeCache.get(applicationCode, () -> getApplicationCacheDAO().getApplicationId(applicationCode));
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- }
-
- if (applicationId == 0) {
- applicationId = getApplicationCacheDAO().getApplicationId(applicationCode);
- if (applicationId != 0) {
- codeCache.put(applicationCode, applicationId);
- }
- }
- return applicationId;
- }
-
- private final Cache idCache = CacheBuilder.newBuilder().maximumSize(1000).build();
-
- public String get(int applicationId) {
- String applicationCode = Const.EMPTY_STRING;
- try {
- applicationCode = idCache.get(applicationId, () -> getApplicationCacheDAO().getApplicationCode(applicationId));
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- }
-
- if (StringUtils.isEmpty(applicationCode)) {
- applicationCode = getApplicationCacheDAO().getApplicationCode(applicationId);
- if (StringUtils.isNotEmpty(applicationCode)) {
- codeCache.put(applicationCode, applicationId);
- }
- }
- return applicationCode;
- }
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/InstanceCacheGuavaService.java b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/InstanceCacheGuavaService.java
deleted file mode 100644
index 0f2e9a27ea5e..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/InstanceCacheGuavaService.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.guava.service;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import org.skywalking.apm.collector.cache.service.InstanceCacheService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IInstanceCacheDAO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class InstanceCacheGuavaService implements InstanceCacheService {
-
- private final Logger logger = LoggerFactory.getLogger(InstanceCacheGuavaService.class);
-
- private final Cache integerCache = CacheBuilder.newBuilder().initialCapacity(100).maximumSize(5000).build();
-
- private final Cache stringCache = CacheBuilder.newBuilder().initialCapacity(100).maximumSize(5000).build();
-
- private final ModuleManager moduleManager;
- private IInstanceCacheDAO instanceCacheDAO;
-
- public InstanceCacheGuavaService(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- }
-
- private IInstanceCacheDAO getInstanceCacheDAO() {
- if (ObjectUtils.isEmpty(instanceCacheDAO)) {
- this.instanceCacheDAO = moduleManager.find(StorageModule.NAME).getService(IInstanceCacheDAO.class);
- }
- return this.instanceCacheDAO;
- }
-
- public int get(int applicationInstanceId) {
-
- int applicationId = 0;
- try {
- applicationId = integerCache.get(applicationInstanceId, () -> getInstanceCacheDAO().getApplicationId(applicationInstanceId));
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- }
-
- if (applicationId == 0) {
- applicationId = getInstanceCacheDAO().getApplicationId(applicationInstanceId);
- if (applicationId != 0) {
- integerCache.put(applicationInstanceId, applicationId);
- }
- }
- return applicationId;
- }
-
- @Override public int getInstanceId(int applicationId, String agentUUID) {
- String key = applicationId + Const.ID_SPLIT + agentUUID;
-
- int instanceId = 0;
- try {
- instanceId = stringCache.get(key, () -> getInstanceCacheDAO().getInstanceId(applicationId, agentUUID));
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- }
-
- if (instanceId == 0) {
- instanceId = getInstanceCacheDAO().getInstanceId(applicationId, agentUUID);
- if (applicationId != 0) {
- stringCache.put(key, instanceId);
- }
- }
- return instanceId;
- }
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ServiceIdCacheGuavaService.java b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ServiceIdCacheGuavaService.java
deleted file mode 100644
index 85d6aa5aa872..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ServiceIdCacheGuavaService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.guava.service;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import org.skywalking.apm.collector.cache.service.ServiceIdCacheService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IServiceNameCacheDAO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceIdCacheGuavaService implements ServiceIdCacheService {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceIdCacheGuavaService.class);
-
- private final Cache serviceIdCache = CacheBuilder.newBuilder().maximumSize(1000).build();
-
- private final ModuleManager moduleManager;
- private IServiceNameCacheDAO serviceNameCacheDAO;
-
- public ServiceIdCacheGuavaService(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- }
-
- private IServiceNameCacheDAO getServiceNameCacheDAO() {
- if (ObjectUtils.isEmpty(serviceNameCacheDAO)) {
- this.serviceNameCacheDAO = moduleManager.find(StorageModule.NAME).getService(IServiceNameCacheDAO.class);
- }
- return this.serviceNameCacheDAO;
- }
-
- public int get(int applicationId, String serviceName) {
- int serviceId = 0;
- try {
- serviceId = serviceIdCache.get(applicationId + Const.ID_SPLIT + serviceName, () -> getServiceNameCacheDAO().getServiceId(applicationId, serviceName));
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- }
-
- if (serviceId == 0) {
- serviceId = getServiceNameCacheDAO().getServiceId(applicationId, serviceName);
- if (serviceId != 0) {
- serviceIdCache.put(applicationId + Const.ID_SPLIT + serviceName, serviceId);
- }
- }
- return serviceId;
- }
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ServiceNameCacheGuavaService.java b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ServiceNameCacheGuavaService.java
deleted file mode 100644
index 55b9d7792e52..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/skywalking/apm/collector/cache/guava/service/ServiceNameCacheGuavaService.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cache.guava.service;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import org.skywalking.apm.collector.cache.service.ServiceNameCacheService;
-import org.skywalking.apm.collector.core.module.ModuleManager;
-import org.skywalking.apm.collector.core.util.Const;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.core.util.StringUtils;
-import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IServiceNameCacheDAO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ServiceNameCacheGuavaService implements ServiceNameCacheService {
-
- private final Logger logger = LoggerFactory.getLogger(ServiceNameCacheGuavaService.class);
-
- private final Cache serviceNameCache = CacheBuilder.newBuilder().maximumSize(10000).build();
-
- private final ModuleManager moduleManager;
- private IServiceNameCacheDAO serviceNameCacheDAO;
-
- public ServiceNameCacheGuavaService(ModuleManager moduleManager) {
- this.moduleManager = moduleManager;
- }
-
- private IServiceNameCacheDAO getServiceNameCacheDAO() {
- if (ObjectUtils.isEmpty(serviceNameCacheDAO)) {
- this.serviceNameCacheDAO = moduleManager.find(StorageModule.NAME).getService(IServiceNameCacheDAO.class);
- }
- return this.serviceNameCacheDAO;
- }
-
- public String get(int serviceId) {
- String serviceName = Const.EMPTY_STRING;
- try {
- serviceName = serviceNameCache.get(serviceId, () -> getServiceNameCacheDAO().getServiceName(serviceId));
- } catch (Throwable e) {
- logger.error(e.getMessage(), e);
- }
-
- if (StringUtils.isEmpty(serviceName)) {
- serviceName = getServiceNameCacheDAO().getServiceName(serviceId);
- if (StringUtils.isNotEmpty(serviceName)) {
- serviceNameCache.put(serviceId, serviceName);
- }
- }
-
- return serviceName;
- }
-
- public String getSplitServiceName(String serviceName) {
- if (StringUtils.isNotEmpty(serviceName)) {
- String[] serviceNames = serviceName.split(Const.ID_SPLIT);
- if (serviceNames.length == 2) {
- return serviceNames[1];
- } else {
- return Const.EMPTY_STRING;
- }
- } else {
- return Const.EMPTY_STRING;
- }
- }
-}
diff --git a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
deleted file mode 100644
index b944ba647f34..000000000000
--- a/apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.cache.guava.CacheModuleGuavaProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cache/pom.xml b/apm-collector/apm-collector-cache/pom.xml
deleted file mode 100644
index 2f544b2992e6..000000000000
--- a/apm-collector/apm-collector-cache/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-cache
- pom
-
- collector-cache-define
- collector-cache-guava-provider
-
-
-
-
- org.skywalking
- apm-collector-core
- ${project.version}
-
-
- org.skywalking
- collector-storage-define
- ${project.version}
-
-
-
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
deleted file mode 100644
index 6aae47ecb094..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
- apm-collector-cluster
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-cluster-define
- jar
-
-
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterException.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterException.java
deleted file mode 100644
index cee9eba365d0..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster;
-
-import org.skywalking.apm.collector.core.CollectorException;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class ClusterException extends CollectorException {
-
- public ClusterException(String message) {
- super(message);
- }
-
- public ClusterException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterModule.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterModule.java
deleted file mode 100644
index 97ab7fedf00a..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterModule.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster;
-
-import org.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public class ClusterModule extends Module {
-
- public static final String NAME = "cluster";
-
- @Override public String name() {
- return NAME;
- }
-
- @Override public Class[] services() {
- return new Class[] {ModuleListenerService.class, ModuleRegisterService.class};
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleListener.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleListener.java
deleted file mode 100644
index 543245d8eb66..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterModuleListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class ClusterModuleListener {
-
- private Set addresses;
-
- public ClusterModuleListener() {
- addresses = new HashSet<>();
- }
-
- public abstract String path();
-
- public final void addAddress(String address) {
- addresses.add(address);
- }
-
- public final void removeAddress(String address) {
- addresses.remove(address);
- }
-
- public final Set getAddresses() {
- return addresses;
- }
-
- public abstract void serverJoinNotify(String serverAddress);
-
- public abstract void serverQuitNotify(String serverAddress);
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterNodeExistException.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterNodeExistException.java
deleted file mode 100644
index 506b0fbe37dd..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ClusterNodeExistException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster;
-
-/**
- * @author peng-yongsheng
- */
-public class ClusterNodeExistException extends ClusterException {
-
- public ClusterNodeExistException(String message) {
- super(message);
- }
-
- public ClusterNodeExistException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/DataMonitor.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/DataMonitor.java
deleted file mode 100644
index 8a30089c3bd5..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/DataMonitor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster;
-
-import org.skywalking.apm.collector.client.Client;
-import org.skywalking.apm.collector.client.ClientException;
-
-/**
- * @author peng-yongsheng
- */
-public interface DataMonitor {
- String BASE_CATALOG = "/skywalking";
-
- void setClient(Client client);
-
- void addListener(ClusterModuleListener listener) throws ClientException;
-
- void register(String path, ModuleRegistration registration) throws ClientException;
-
- ClusterModuleListener getListener(String path);
-
- void createPath(String path) throws ClientException;
-
- void setData(String path, String value) throws ClientException;
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ModuleRegistration.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ModuleRegistration.java
deleted file mode 100644
index 2aed56281111..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/ModuleRegistration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class ModuleRegistration {
-
- public abstract Value buildValue();
-
- public static class Value {
- private final String host;
- private final int port;
- private final String contextPath;
-
- public Value(String host, int port, String contextPath) {
- this.host = host;
- this.port = port;
- this.contextPath = contextPath;
- }
-
- public String getHost() {
- return host;
- }
-
- public int getPort() {
- return port;
- }
-
- public String getHostPort() {
- return host + ":" + port;
- }
-
- public String getContextPath() {
- return contextPath;
- }
- }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/service/ModuleListenerService.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/service/ModuleListenerService.java
deleted file mode 100644
index f5a908aaf5d5..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/service/ModuleListenerService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.service;
-
-import org.skywalking.apm.collector.cluster.ClusterModuleListener;
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface ModuleListenerService extends Service {
- void addListener(ClusterModuleListener listener);
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/service/ModuleRegisterService.java b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/service/ModuleRegisterService.java
deleted file mode 100644
index 4566204e0c8a..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/java/org/skywalking/apm/collector/cluster/service/ModuleRegisterService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.service;
-
-import org.skywalking.apm.collector.cluster.ModuleRegistration;
-import org.skywalking.apm.collector.core.module.Service;
-
-/**
- * @author peng-yongsheng
- */
-public interface ModuleRegisterService extends Service {
- void register(String moduleName, String providerName, ModuleRegistration registration);
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module b/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
deleted file mode 100644
index f70f73083ca6..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.cluster.ClusterModule
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
deleted file mode 100644
index 93f498265e1f..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- apm-collector-cluster
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-cluster-redis-provider
- jar
-
-
-
- org.skywalking
- collector-cluster-define
- ${project.version}
-
-
-
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterModuleRedisProvider.java b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterModuleRedisProvider.java
deleted file mode 100644
index 90c342fcd478..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/skywalking/apm/collector/cluster/redis/ClusterModuleRedisProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.redis;
-
-import java.util.Properties;
-import org.skywalking.apm.collector.cluster.ClusterModule;
-import org.skywalking.apm.collector.cluster.redis.service.RedisModuleRegisterService;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.ModuleProvider;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-
-/**
- * @author peng-yongsheng
- */
-public class ClusterModuleRedisProvider extends ModuleProvider {
-
- @Override public String name() {
- return "redis";
- }
-
- @Override public Class module() {
- return ClusterModule.class;
- }
-
- @Override public void prepare(Properties config) throws ServiceNotProvidedException {
- this.registerServiceImplementation(ModuleRegisterService.class, new RedisModuleRegisterService());
- }
-
- @Override public void start(Properties config) throws ServiceNotProvidedException {
-
- }
-
- @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
-
- }
-
- @Override public String[] requiredModules() {
- return new String[0];
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/skywalking/apm/collector/cluster/redis/service/RedisModuleRegisterService.java b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/skywalking/apm/collector/cluster/redis/service/RedisModuleRegisterService.java
deleted file mode 100644
index 084958d319cb..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/java/org/skywalking/apm/collector/cluster/redis/service/RedisModuleRegisterService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.redis.service;
-
-import org.skywalking.apm.collector.cluster.ModuleRegistration;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-
-/**
- * @author peng-yongsheng
- */
-public class RedisModuleRegisterService implements ModuleRegisterService {
-
- @Override public void register(String moduleName, String providerName, ModuleRegistration registration) {
-
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
deleted file mode 100644
index f844abe11c8d..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-redis-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.cluster.redis.ClusterModuleRedisProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
deleted file mode 100644
index a20b3a6f0917..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- apm-collector-cluster
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-cluster-standalone-provider
- jar
-
-
-
- org.skywalking
- collector-cluster-define
- ${project.version}
-
-
-
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java
deleted file mode 100644
index 3778504f3bb2..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterModuleStandaloneProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.standalone;
-
-import java.util.Properties;
-import org.skywalking.apm.collector.client.h2.H2Client;
-import org.skywalking.apm.collector.client.h2.H2ClientException;
-import org.skywalking.apm.collector.cluster.ClusterModule;
-import org.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.skywalking.apm.collector.cluster.standalone.service.StandaloneModuleListenerService;
-import org.skywalking.apm.collector.cluster.standalone.service.StandaloneModuleRegisterService;
-import org.skywalking.apm.collector.core.CollectorException;
-import org.skywalking.apm.collector.core.UnexpectedException;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.ModuleProvider;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.skywalking.apm.collector.core.util.Const;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ClusterModuleStandaloneProvider extends ModuleProvider {
-
- private final Logger logger = LoggerFactory.getLogger(ClusterModuleStandaloneProvider.class);
-
- private static final String URL = "url";
- private static final String USER_NAME = "user_name";
-
- private H2Client h2Client;
- private ClusterStandaloneDataMonitor dataMonitor;
-
- @Override public String name() {
- return "standalone";
- }
-
- @Override public Class module() {
- return ClusterModule.class;
- }
-
- @Override public void prepare(Properties config) throws ServiceNotProvidedException {
- this.dataMonitor = new ClusterStandaloneDataMonitor();
-
- final String url = config.getProperty(URL);
- final String userName = config.getProperty(USER_NAME);
- h2Client = new H2Client(url, userName, Const.EMPTY_STRING);
- this.dataMonitor.setClient(h2Client);
-
- this.registerServiceImplementation(ModuleListenerService.class, new StandaloneModuleListenerService(dataMonitor));
- this.registerServiceImplementation(ModuleRegisterService.class, new StandaloneModuleRegisterService(dataMonitor));
- }
-
- @Override public void start(Properties config) throws ServiceNotProvidedException {
- try {
- h2Client.initialize();
- } catch (H2ClientException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
- try {
- dataMonitor.start();
- } catch (CollectorException e) {
- throw new UnexpectedException(e.getMessage());
- }
- }
-
- @Override public String[] requiredModules() {
- return new String[0];
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java
deleted file mode 100644
index 9ceeb9960e62..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/ClusterStandaloneDataMonitor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.standalone;
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.skywalking.apm.collector.client.Client;
-import org.skywalking.apm.collector.client.ClientException;
-import org.skywalking.apm.collector.client.h2.H2Client;
-import org.skywalking.apm.collector.cluster.ClusterModuleListener;
-import org.skywalking.apm.collector.cluster.DataMonitor;
-import org.skywalking.apm.collector.cluster.ModuleRegistration;
-import org.skywalking.apm.collector.core.CollectorException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ClusterStandaloneDataMonitor implements DataMonitor {
-
- private final Logger logger = LoggerFactory.getLogger(ClusterStandaloneDataMonitor.class);
-
- private H2Client client;
-
- private Map listeners;
- private Map registrations;
-
- public ClusterStandaloneDataMonitor() {
- listeners = new LinkedHashMap<>();
- registrations = new LinkedHashMap<>();
- }
-
- @Override public void setClient(Client client) {
- this.client = (H2Client)client;
- }
-
- @Override
- public void addListener(ClusterModuleListener listener) {
- String path = BASE_CATALOG + listener.path();
- logger.info("listener path: {}", path);
- listeners.put(path, listener);
- }
-
- @Override public ClusterModuleListener getListener(String path) {
- path = BASE_CATALOG + path;
- return listeners.get(path);
- }
-
- @Override public void register(String path, ModuleRegistration registration) {
- registrations.put(BASE_CATALOG + path, registration);
- }
-
- @Override public void createPath(String path) throws ClientException {
-
- }
-
- @Override public void setData(String path, String value) throws ClientException {
- if (listeners.containsKey(path)) {
- listeners.get(path).addAddress(value);
- listeners.get(path).serverJoinNotify(value);
- }
- }
-
- public void start() throws CollectorException {
- Iterator> entryIterator = registrations.entrySet().iterator();
- while (entryIterator.hasNext()) {
- Map.Entry next = entryIterator.next();
- ModuleRegistration.Value value = next.getValue().buildValue();
- String contextPath = value.getContextPath() == null ? "" : value.getContextPath();
- setData(next.getKey(), value.getHostPort() + contextPath);
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/service/StandaloneModuleListenerService.java b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/service/StandaloneModuleListenerService.java
deleted file mode 100644
index c81753ebd9a8..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/service/StandaloneModuleListenerService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.standalone.service;
-
-import org.skywalking.apm.collector.cluster.ClusterModuleListener;
-import org.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.skywalking.apm.collector.cluster.standalone.ClusterStandaloneDataMonitor;
-
-/**
- * @author peng-yongsheng
- */
-public class StandaloneModuleListenerService implements ModuleListenerService {
-
- private final ClusterStandaloneDataMonitor dataMonitor;
-
- public StandaloneModuleListenerService(ClusterStandaloneDataMonitor dataMonitor) {
- this.dataMonitor = dataMonitor;
- }
-
- @Override public void addListener(ClusterModuleListener listener) {
- dataMonitor.addListener(listener);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/service/StandaloneModuleRegisterService.java b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/service/StandaloneModuleRegisterService.java
deleted file mode 100644
index b4bf53ce8690..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/java/org/skywalking/apm/collector/cluster/standalone/service/StandaloneModuleRegisterService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.standalone.service;
-
-import org.skywalking.apm.collector.cluster.ModuleRegistration;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.skywalking.apm.collector.cluster.standalone.ClusterStandaloneDataMonitor;
-
-/**
- * @author peng-yongsheng
- */
-public class StandaloneModuleRegisterService implements ModuleRegisterService {
-
- private final ClusterStandaloneDataMonitor dataMonitor;
-
- public StandaloneModuleRegisterService(ClusterStandaloneDataMonitor dataMonitor) {
- this.dataMonitor = dataMonitor;
- }
-
- @Override public void register(String moduleName, String providerName, ModuleRegistration registration) {
- String path = "/" + moduleName + "/" + providerName;
- dataMonitor.register(path, registration);
- }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
deleted file mode 100644
index 214befe0f0e2..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-standalone-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.cluster.standalone.ClusterModuleStandaloneProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
deleted file mode 100644
index 23a1bb836ac0..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- apm-collector-cluster
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- collector-cluster-zookeeper-provider
- jar
-
-
-
- org.skywalking
- collector-cluster-define
- ${project.version}
-
-
-
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterModuleZookeeperProvider.java b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterModuleZookeeperProvider.java
deleted file mode 100644
index c4cfb68cff49..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterModuleZookeeperProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.zookeeper;
-
-import java.util.Properties;
-import org.skywalking.apm.collector.client.zookeeper.ZookeeperClient;
-import org.skywalking.apm.collector.client.zookeeper.ZookeeperClientException;
-import org.skywalking.apm.collector.cluster.ClusterModule;
-import org.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.skywalking.apm.collector.cluster.zookeeper.service.ZookeeperModuleListenerService;
-import org.skywalking.apm.collector.cluster.zookeeper.service.ZookeeperModuleRegisterService;
-import org.skywalking.apm.collector.core.CollectorException;
-import org.skywalking.apm.collector.core.UnexpectedException;
-import org.skywalking.apm.collector.core.module.Module;
-import org.skywalking.apm.collector.core.module.ModuleProvider;
-import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ClusterModuleZookeeperProvider extends ModuleProvider {
-
- private final Logger logger = LoggerFactory.getLogger(ClusterModuleZookeeperProvider.class);
-
- private static final String HOST_PORT = "hostPort";
- private static final String SESSION_TIMEOUT = "sessionTimeout";
-
- private ZookeeperClient zookeeperClient;
- private ClusterZKDataMonitor dataMonitor;
-
- @Override public String name() {
- return "zookeeper";
- }
-
- @Override public Class module() {
- return ClusterModule.class;
- }
-
- @Override public void prepare(Properties config) throws ServiceNotProvidedException {
- dataMonitor = new ClusterZKDataMonitor();
-
- final String hostPort = config.getProperty(HOST_PORT);
- final int sessionTimeout = (Integer)config.get(SESSION_TIMEOUT);
- zookeeperClient = new ZookeeperClient(hostPort, sessionTimeout, dataMonitor);
- dataMonitor.setClient(zookeeperClient);
-
- this.registerServiceImplementation(ModuleListenerService.class, new ZookeeperModuleListenerService(dataMonitor));
- this.registerServiceImplementation(ModuleRegisterService.class, new ZookeeperModuleRegisterService(dataMonitor));
- }
-
- @Override public void start(Properties config) throws ServiceNotProvidedException {
- try {
- zookeeperClient.initialize();
- } catch (ZookeeperClientException e) {
- logger.error(e.getMessage(), e);
- }
- }
-
- @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {
- try {
- dataMonitor.start();
- } catch (CollectorException e) {
- throw new UnexpectedException(e.getMessage());
- }
- }
-
- @Override public String[] requiredModules() {
- return new String[0];
- }
-
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java
deleted file mode 100644
index 87c21d809885..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.zookeeper;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.data.Stat;
-import org.skywalking.apm.collector.client.Client;
-import org.skywalking.apm.collector.client.ClientException;
-import org.skywalking.apm.collector.client.zookeeper.ZookeeperClient;
-import org.skywalking.apm.collector.client.zookeeper.ZookeeperClientException;
-import org.skywalking.apm.collector.cluster.ClusterModuleListener;
-import org.skywalking.apm.collector.cluster.ClusterNodeExistException;
-import org.skywalking.apm.collector.cluster.DataMonitor;
-import org.skywalking.apm.collector.cluster.ModuleRegistration;
-import org.skywalking.apm.collector.core.CollectorException;
-import org.skywalking.apm.collector.core.util.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ClusterZKDataMonitor implements DataMonitor, Watcher {
-
- private final Logger logger = LoggerFactory.getLogger(ClusterZKDataMonitor.class);
-
- private ZookeeperClient client;
-
- private Map listeners;
- private Map registrations;
-
- public ClusterZKDataMonitor() {
- listeners = new LinkedHashMap<>();
- registrations = new LinkedHashMap<>();
- }
-
- @Override public synchronized void process(WatchedEvent event) {
- logger.info("changed path {}, event type: {}", event.getPath(), event.getType().name());
- if (listeners.containsKey(event.getPath())) {
- List paths;
- try {
- paths = client.getChildren(event.getPath(), true);
- ClusterModuleListener listener = listeners.get(event.getPath());
- Set remoteNodes = new HashSet<>();
- Set notifiedNodes = listener.getAddresses();
- if (CollectionUtils.isNotEmpty(paths)) {
- for (String serverPath : paths) {
- Stat stat = new Stat();
- byte[] data = client.getData(event.getPath() + "/" + serverPath, true, stat);
- String dataStr = new String(data);
- String addressValue = serverPath + dataStr;
- remoteNodes.add(addressValue);
- if (!notifiedNodes.contains(addressValue)) {
- logger.info("path children has been created, path: {}, data: {}", event.getPath() + "/" + serverPath, dataStr);
- listener.addAddress(addressValue);
- listener.serverJoinNotify(addressValue);
- }
- }
- }
-
- String[] notifiedNodeArray = notifiedNodes.toArray(new String[notifiedNodes.size()]);
- for (int i = notifiedNodeArray.length - 1; i >= 0; i--) {
- String address = notifiedNodeArray[i];
- if (remoteNodes.isEmpty() || !remoteNodes.contains(address)) {
- logger.info("path children has been remove, path and data: {}", event.getPath() + "/" + address);
- listener.removeAddress(address);
- listener.serverQuitNotify(address);
- }
- }
- } catch (ZookeeperClientException e) {
- logger.error(e.getMessage(), e);
- }
- }
- }
-
- @Override public void setClient(Client client) {
- this.client = (ZookeeperClient)client;
- }
-
- public void start() throws CollectorException {
- Iterator> entryIterator = registrations.entrySet().iterator();
- while (entryIterator.hasNext()) {
- Map.Entry next = entryIterator.next();
- createPath(next.getKey());
-
- ModuleRegistration.Value value = next.getValue().buildValue();
- String contextPath = value.getContextPath() == null ? "" : value.getContextPath();
-
- client.getChildren(next.getKey(), true);
- String serverPath = next.getKey() + "/" + value.getHostPort();
-
- Stat stat = client.exists(serverPath, false);
- if (stat != null) {
- client.delete(serverPath, stat.getVersion());
- }
- stat = client.exists(serverPath, false);
- if (stat == null) {
- setData(serverPath, contextPath);
- } else {
- client.delete(serverPath, stat.getVersion());
- throw new ClusterNodeExistException("current address: " + value.getHostPort() + " has been registered, check the host and port configuration or wait a moment.");
- }
- }
- }
-
- @Override public void addListener(ClusterModuleListener listener) {
- String path = BASE_CATALOG + listener.path();
- logger.info("listener path: {}", path);
- listeners.put(path, listener);
- }
-
- @Override public void register(String path, ModuleRegistration registration) {
- registrations.put(BASE_CATALOG + path, registration);
- }
-
- @Override public ClusterModuleListener getListener(String path) {
- path = BASE_CATALOG + path;
- return listeners.get(path);
- }
-
- @Override public void createPath(String path) throws ClientException {
- String[] paths = path.replaceFirst("/", "").split("/");
-
- StringBuilder pathBuilder = new StringBuilder();
- for (String subPath : paths) {
- pathBuilder.append("/").append(subPath);
- if (client.exists(pathBuilder.toString(), false) == null) {
- client.create(pathBuilder.toString(), null, ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
- }
- }
- }
-
- @Override public void setData(String path, String value) throws ClientException {
- if (client.exists(path, false) == null) {
- client.create(path, value.getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL);
- } else {
- client.setData(path, value.getBytes(), -1);
- }
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/service/ZookeeperModuleListenerService.java b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/service/ZookeeperModuleListenerService.java
deleted file mode 100644
index 8d745474f587..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/service/ZookeeperModuleListenerService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.zookeeper.service;
-
-import org.skywalking.apm.collector.cluster.ClusterModuleListener;
-import org.skywalking.apm.collector.cluster.service.ModuleListenerService;
-import org.skywalking.apm.collector.cluster.zookeeper.ClusterZKDataMonitor;
-
-/**
- * @author peng-yongsheng
- */
-public class ZookeeperModuleListenerService implements ModuleListenerService {
-
- private final ClusterZKDataMonitor dataMonitor;
-
- public ZookeeperModuleListenerService(ClusterZKDataMonitor dataMonitor) {
- this.dataMonitor = dataMonitor;
- }
-
- @Override public void addListener(ClusterModuleListener listener) {
- dataMonitor.addListener(listener);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/service/ZookeeperModuleRegisterService.java b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/service/ZookeeperModuleRegisterService.java
deleted file mode 100644
index 7b2c08cf03a0..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/service/ZookeeperModuleRegisterService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.cluster.zookeeper.service;
-
-import org.skywalking.apm.collector.cluster.ModuleRegistration;
-import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
-import org.skywalking.apm.collector.cluster.zookeeper.ClusterZKDataMonitor;
-
-/**
- * @author peng-yongsheng
- */
-public class ZookeeperModuleRegisterService implements ModuleRegisterService {
-
- private final ClusterZKDataMonitor dataMonitor;
-
- public ZookeeperModuleRegisterService(ClusterZKDataMonitor dataMonitor) {
- this.dataMonitor = dataMonitor;
- }
-
- @Override public void register(String moduleName, String providerName, ModuleRegistration registration) {
- String path = "/" + moduleName + "/" + providerName;
- dataMonitor.register(path, registration);
- }
-}
diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
deleted file mode 100644
index 61623297f302..000000000000
--- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.ModuleProvider
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright 2017, OpenSkywalking Organization All rights reserved.
-#
-# Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
-#
-
-org.skywalking.apm.collector.cluster.zookeeper.ClusterModuleZookeeperProvider
\ No newline at end of file
diff --git a/apm-collector/apm-collector-cluster/pom.xml b/apm-collector/apm-collector-cluster/pom.xml
deleted file mode 100644
index 9675ace2ca78..000000000000
--- a/apm-collector/apm-collector-cluster/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-cluster
- pom
-
- collector-cluster-define
- collector-cluster-zookeeper-provider
- collector-cluster-redis-provider
- collector-cluster-standalone-provider
-
-
-
-
- org.skywalking
- apm-collector-core
- ${project.version}
-
-
- org.skywalking
- client-component
- ${project.version}
-
-
-
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/client-component/pom.xml b/apm-collector/apm-collector-component/client-component/pom.xml
deleted file mode 100644
index 93c322fdf856..000000000000
--- a/apm-collector/apm-collector-component/client-component/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
- apm-collector-component
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- client-component
- jar
-
-
-
- com.h2database
- h2
- 1.4.196
-
-
- redis.clients
- jedis
- 2.9.0
-
-
- org.elasticsearch.client
- transport
- 5.5.0
-
-
- snakeyaml
- org.yaml
-
-
- netty-common
- io.netty
-
-
- netty-transport
- io.netty
-
-
- netty-codec
- io.netty
-
-
- netty-codec-http
- io.netty
-
-
- netty-buffer
- io.netty
-
-
- netty-handler
- io.netty
-
-
- netty-resolver
- io.netty
-
-
-
-
- org.apache.zookeeper
- zookeeper
- 3.4.10
-
-
- slf4j-api
- org.slf4j
-
-
- slf4j-log4j12
- org.slf4j
-
-
-
-
- org.skywalking
- apm-network
- ${project.version}
-
-
- guava
- com.google.guava
-
-
-
-
-
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/Client.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/Client.java
deleted file mode 100644
index f338b18693d0..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/Client.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client;
-
-/**
- * @author peng-yongsheng
- */
-public interface Client {
- void initialize() throws ClientException;
-
- void shutdown();
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/ClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/ClientException.java
deleted file mode 100644
index fc97f936e033..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/ClientException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client;
-
-import org.skywalking.apm.collector.core.CollectorException;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class ClientException extends CollectorException {
- public ClientException(String message) {
- super(message);
- }
-
- public ClientException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java
deleted file mode 100644
index f4843c7cd053..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClient.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.elasticsearch;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.get.GetRequestBuilder;
-import org.elasticsearch.action.get.MultiGetRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.update.UpdateRequest;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.client.IndicesAdminClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.reindex.DeleteByQueryAction;
-import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder;
-import org.elasticsearch.transport.client.PreBuiltTransportClient;
-import org.skywalking.apm.collector.client.Client;
-import org.skywalking.apm.collector.client.ClientException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ElasticSearchClient implements Client {
-
- private final Logger logger = LoggerFactory.getLogger(ElasticSearchClient.class);
-
- private org.elasticsearch.client.Client client;
-
- private final String clusterName;
-
- private final Boolean clusterTransportSniffer;
-
- private final String clusterNodes;
-
- public ElasticSearchClient(String clusterName, Boolean clusterTransportSniffer, String clusterNodes) {
- this.clusterName = clusterName;
- this.clusterTransportSniffer = clusterTransportSniffer;
- this.clusterNodes = clusterNodes;
- }
-
- @Override public void initialize() throws ClientException {
- Settings settings = Settings.builder()
- .put("cluster.name", clusterName)
- .put("client.transport.sniff", clusterTransportSniffer)
- .build();
-
- client = new PreBuiltTransportClient(settings);
-
- List pairsList = parseClusterNodes(clusterNodes);
- for (AddressPairs pairs : pairsList) {
- try {
- ((PreBuiltTransportClient)client).addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(pairs.host), pairs.port));
- } catch (UnknownHostException e) {
- throw new ElasticSearchClientException(e.getMessage(), e);
- }
- }
- }
-
- @Override public void shutdown() {
-
- }
-
- private List parseClusterNodes(String nodes) {
- List pairsList = new LinkedList<>();
- logger.info("elasticsearch cluster nodes: {}", nodes);
- String[] nodesSplit = nodes.split(",");
- for (int i = 0; i < nodesSplit.length; i++) {
- String node = nodesSplit[i];
- String host = node.split(":")[0];
- String port = node.split(":")[1];
- pairsList.add(new AddressPairs(host, Integer.valueOf(port)));
- }
-
- return pairsList;
- }
-
- class AddressPairs {
- private String host;
- private Integer port;
-
- public AddressPairs(String host, Integer port) {
- this.host = host;
- this.port = port;
- }
- }
-
- public boolean createIndex(String indexName, String indexType, Settings settings, XContentBuilder mappingBuilder) {
- IndicesAdminClient adminClient = client.admin().indices();
- CreateIndexResponse response = adminClient.prepareCreate(indexName).setSettings(settings).addMapping(indexType, mappingBuilder).get();
- logger.info("create {} index with type of {} finished, isAcknowledged: {}", indexName, indexType, response.isAcknowledged());
- return response.isShardsAcked();
- }
-
- public boolean deleteIndex(String indexName) {
- IndicesAdminClient adminClient = client.admin().indices();
- DeleteIndexResponse response = adminClient.prepareDelete(indexName).get();
- logger.info("delete {} index finished, isAcknowledged: {}", indexName, response.isAcknowledged());
- return response.isAcknowledged();
- }
-
- public boolean isExistsIndex(String indexName) {
- IndicesAdminClient adminClient = client.admin().indices();
- IndicesExistsResponse response = adminClient.prepareExists(indexName).get();
- return response.isExists();
- }
-
- public SearchRequestBuilder prepareSearch(String indexName) {
- return client.prepareSearch(indexName);
- }
-
- public IndexRequestBuilder prepareIndex(String indexName, String id) {
- return client.prepareIndex(indexName, "type", id);
- }
-
- public UpdateRequestBuilder prepareUpdate(String indexName, String id) {
- return client.prepareUpdate(indexName, "type", id);
- }
-
- public GetRequestBuilder prepareGet(String indexName, String id) {
- return client.prepareGet(indexName, "type", id);
- }
-
- public DeleteByQueryRequestBuilder prepareDelete() {
- return DeleteByQueryAction.INSTANCE.newRequestBuilder(client);
- }
-
- public MultiGetRequestBuilder prepareMultiGet() {
- return client.prepareMultiGet();
- }
-
- public BulkRequestBuilder prepareBulk() {
- return client.prepareBulk();
- }
-
- public void update(UpdateRequest updateRequest) {
- try {
- client.update(updateRequest).get();
- } catch (InterruptedException | ExecutionException e) {
- logger.error(e.getMessage(), e);
- }
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java
deleted file mode 100644
index 8988e10167e6..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/elasticsearch/ElasticSearchClientException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.elasticsearch;
-
-import org.skywalking.apm.collector.client.ClientException;
-
-/**
- * @author peng-yongsheng
- */
-public class ElasticSearchClientException extends ClientException {
- public ElasticSearchClientException(String message) {
- super(message);
- }
-
- public ElasticSearchClientException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java
deleted file mode 100644
index f792c2ab9706..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClient.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.grpc;
-
-import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-import org.skywalking.apm.collector.client.Client;
-import org.skywalking.apm.collector.client.ClientException;
-
-/**
- * @author peng-yongsheng
- */
-public class GRPCClient implements Client {
-
- private final String host;
-
- private final int port;
-
- private ManagedChannel channel;
-
- public GRPCClient(String host, int port) {
- this.host = host;
- this.port = port;
- }
-
- @Override public void initialize() throws ClientException {
- channel = ManagedChannelBuilder.forAddress(host, port).usePlaintext(true).build();
- }
-
- @Override public void shutdown() {
- channel.shutdownNow();
- }
-
- public ManagedChannel getChannel() {
- return channel;
- }
-
- @Override public String toString() {
- return host + ":" + port;
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java
deleted file mode 100644
index 701167cb5eb0..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/grpc/GRPCClientException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.grpc;
-
-import org.skywalking.apm.collector.client.ClientException;
-
-/**
- * @author peng-yongsheng
- */
-public class GRPCClientException extends ClientException {
-
- public GRPCClientException(String message) {
- super(message);
- }
-
- public GRPCClientException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java
deleted file mode 100644
index a6bef598e840..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2Client.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.h2;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import org.h2.util.IOUtils;
-import org.skywalking.apm.collector.client.Client;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class H2Client implements Client {
-
- private final Logger logger = LoggerFactory.getLogger(H2Client.class);
-
- private Connection conn;
- private String url;
- private String userName;
- private String password;
-
- public H2Client() {
- this.url = "jdbc:h2:mem:collector";
- this.userName = "";
- this.password = "";
- }
-
- public H2Client(String url, String userName, String password) {
- this.url = url;
- this.userName = userName;
- this.password = password;
- }
-
- @Override public void initialize() throws H2ClientException {
- try {
- Class.forName("org.h2.Driver");
- conn = DriverManager.
- getConnection(this.url, this.userName, this.password);
- } catch (Exception e) {
- throw new H2ClientException(e.getMessage(), e);
- }
- }
-
- @Override public void shutdown() {
- IOUtils.closeSilently(conn);
- }
-
- public Connection getConnection() throws H2ClientException {
- return conn;
- }
-
- public void execute(String sql) throws H2ClientException {
- try (Statement statement = getConnection().createStatement()) {
- statement.execute(sql);
- statement.closeOnCompletion();
- } catch (SQLException e) {
- throw new H2ClientException(e.getMessage(), e);
- }
- }
-
- public ResultSet executeQuery(String sql, Object[] params) throws H2ClientException {
- logger.debug("execute query with result: {}", sql);
- ResultSet rs;
- PreparedStatement statement;
- try {
- statement = getConnection().prepareStatement(sql);
- if (params != null) {
- for (int i = 0; i < params.length; i++) {
- statement.setObject(i + 1, params[i]);
- }
- }
- rs = statement.executeQuery();
- statement.closeOnCompletion();
- } catch (SQLException e) {
- throw new H2ClientException(e.getMessage(), e);
- }
- return rs;
- }
-
- public boolean execute(String sql, Object[] params) throws H2ClientException {
- logger.debug("execute insert/update/delete: {}", sql);
- boolean flag;
- Connection conn = getConnection();
- try (PreparedStatement statement = conn.prepareStatement(sql)) {
- conn.setAutoCommit(true);
- if (params != null) {
- for (int i = 0; i < params.length; i++) {
- statement.setObject(i + 1, params[i]);
- }
- }
- flag = statement.execute();
- } catch (SQLException e) {
- throw new H2ClientException(e.getMessage(), e);
- }
- return flag;
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java
deleted file mode 100644
index e50c2081dcfe..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/h2/H2ClientException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.h2;
-
-import org.skywalking.apm.collector.client.ClientException;
-
-/**
- * @author peng-yongsheng
- */
-public class H2ClientException extends ClientException {
-
- public H2ClientException(String message) {
- super(message);
- }
-
- public H2ClientException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java
deleted file mode 100644
index 95508b667f40..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClient.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.redis;
-
-import org.skywalking.apm.collector.client.Client;
-import org.skywalking.apm.collector.client.ClientException;
-import redis.clients.jedis.Jedis;
-
-/**
- * @author peng-yongsheng
- */
-public class RedisClient implements Client {
-
- private Jedis jedis;
-
- private final String host;
- private final int port;
-
- public RedisClient(String host, int port) {
- this.host = host;
- this.port = port;
- }
-
- @Override public void initialize() throws ClientException {
- jedis = new Jedis(host, port);
- }
-
- @Override public void shutdown() {
-
- }
-
- public void setex(String key, int seconds, String value) {
- jedis.setex(key, seconds, value);
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java
deleted file mode 100644
index 7d1cda27751c..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/redis/RedisClientException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.redis;
-
-import org.skywalking.apm.collector.client.ClientException;
-
-/**
- * @author peng-yongsheng
- */
-public class RedisClientException extends ClientException {
-
- public RedisClientException(String message) {
- super(message);
- }
-
- public RedisClientException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java
deleted file mode 100644
index 2e247de42501..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClient.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.zookeeper;
-
-import java.io.IOException;
-import java.util.List;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Stat;
-import org.skywalking.apm.collector.client.Client;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class ZookeeperClient implements Client {
-
- private final Logger logger = LoggerFactory.getLogger(ZookeeperClient.class);
-
- private ZooKeeper zk;
-
- private final String hostPort;
- private final int sessionTimeout;
- private final Watcher watcher;
-
- public ZookeeperClient(String hostPort, int sessionTimeout, Watcher watcher) {
- this.hostPort = hostPort;
- this.sessionTimeout = sessionTimeout;
- this.watcher = watcher;
- }
-
- @Override public void initialize() throws ZookeeperClientException {
- try {
- zk = new ZooKeeper(hostPort, sessionTimeout, watcher);
- } catch (IOException e) {
- throw new ZookeeperClientException(e.getMessage(), e);
- }
- }
-
- @Override public void shutdown() {
-
- }
-
- public void create(final String path, byte data[], List acl,
- CreateMode createMode) throws ZookeeperClientException {
- try {
- zk.create(path, data, acl, createMode);
- } catch (KeeperException | InterruptedException e) {
- throw new ZookeeperClientException(e.getMessage(), e);
- }
- }
-
- public Stat exists(final String path, boolean watch) throws ZookeeperClientException {
- try {
- return zk.exists(path, watch);
- } catch (KeeperException | InterruptedException e) {
- throw new ZookeeperClientException(e.getMessage(), e);
- }
- }
-
- public void delete(final String path, int version) throws ZookeeperClientException {
- try {
- zk.delete(path, version);
- } catch (KeeperException | InterruptedException e) {
- throw new ZookeeperClientException(e.getMessage(), e);
- }
- }
-
- public byte[] getData(String path, boolean watch, Stat stat) throws ZookeeperClientException {
- try {
- return zk.getData(path, watch, stat);
- } catch (KeeperException | InterruptedException e) {
- throw new ZookeeperClientException(e.getMessage(), e);
- }
- }
-
- public Stat setData(final String path, byte data[], int version) throws ZookeeperClientException {
- try {
- return zk.setData(path, data, version);
- } catch (KeeperException | InterruptedException e) {
- throw new ZookeeperClientException(e.getMessage(), e);
- }
- }
-
- public List getChildren(final String path, boolean watch) throws ZookeeperClientException {
- try {
- return zk.getChildren(path, watch);
- } catch (KeeperException | InterruptedException e) {
- throw new ZookeeperClientException(e.getMessage(), e);
- }
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java
deleted file mode 100644
index 3b450e02dd4a..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/ZookeeperClientException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.zookeeper;
-
-import org.skywalking.apm.collector.client.ClientException;
-
-/**
- * @author peng-yongsheng
- */
-public class ZookeeperClientException extends ClientException {
- public ZookeeperClientException(String message) {
- super(message);
- }
-
- public ZookeeperClientException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/util/PathUtils.java b/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/util/PathUtils.java
deleted file mode 100644
index ccf8d37e4496..000000000000
--- a/apm-collector/apm-collector-component/client-component/src/main/java/org/skywalking/apm/collector/client/zookeeper/util/PathUtils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.client.zookeeper.util;
-
-/**
- * @author peng-yongsheng
- */
-public class PathUtils {
-
- public static String convertKey2Path(String key) {
- String[] keys = key.split("\\.");
- StringBuilder pathBuilder = new StringBuilder();
- for (String subPath : keys) {
- pathBuilder.append("/").append(subPath);
- }
- return pathBuilder.toString();
- }
-}
diff --git a/apm-collector/apm-collector-component/pom.xml b/apm-collector/apm-collector-component/pom.xml
deleted file mode 100644
index c68c18766e5c..000000000000
--- a/apm-collector/apm-collector-component/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-component
- pom
-
- client-component
- server-component
-
-
-
-
- org.skywalking
- apm-collector-core
- ${project.version}
-
-
-
diff --git a/apm-collector/apm-collector-component/server-component/pom.xml b/apm-collector/apm-collector-component/server-component/pom.xml
deleted file mode 100644
index 0ff3d1fcf8bf..000000000000
--- a/apm-collector/apm-collector-component/server-component/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
- apm-collector-component
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- server-component
- jar
-
-
- 9.4.2.v20170220
-
-
-
-
- org.skywalking
- apm-network
- ${project.version}
-
-
- guava
- com.google.guava
-
-
-
-
- org.eclipse.jetty
- jetty-server
- ${jetty.version}
-
-
- org.eclipse.jetty
- jetty-servlet
- ${jetty.version}
-
-
-
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/Server.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/Server.java
deleted file mode 100644
index facf76e56f2d..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/Server.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server;
-
-/**
- * @author peng-yongsheng
- */
-public interface Server {
-
- String hostPort();
-
- String serverClassify();
-
- void initialize() throws ServerException;
-
- void start() throws ServerException;
-
- void addHandler(ServerHandler handler);
-}
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerException.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerException.java
deleted file mode 100644
index cb88ebe9900c..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server;
-
-import org.skywalking.apm.collector.core.CollectorException;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class ServerException extends CollectorException {
-
- public ServerException(String message) {
- super(message);
- }
-
- public ServerException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHandler.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHandler.java
deleted file mode 100644
index 0baaf38f2b41..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/ServerHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server;
-
-/**
- * @author peng-yongsheng
- */
-public interface ServerHandler {
-}
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCHandler.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCHandler.java
deleted file mode 100644
index 0f2c228dc1aa..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.grpc;
-
-import org.skywalking.apm.collector.server.ServerHandler;
-
-/**
- * @author peng-yongsheng
- */
-public interface GRPCHandler extends ServerHandler {
-}
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java
deleted file mode 100644
index b4c68fb7c139..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServer.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.grpc;
-
-import io.grpc.netty.NettyServerBuilder;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import org.skywalking.apm.collector.server.Server;
-import org.skywalking.apm.collector.server.ServerException;
-import org.skywalking.apm.collector.server.ServerHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class GRPCServer implements Server {
-
- private final Logger logger = LoggerFactory.getLogger(GRPCServer.class);
-
- private final String host;
- private final int port;
- private io.grpc.Server server;
- private NettyServerBuilder nettyServerBuilder;
-
- public GRPCServer(String host, int port) {
- this.host = host;
- this.port = port;
- }
-
- @Override public String hostPort() {
- return host + ":" + port;
- }
-
- @Override public String serverClassify() {
- return "Google-RPC";
- }
-
- @Override public void initialize() throws ServerException {
- InetSocketAddress address = new InetSocketAddress(host, port);
- nettyServerBuilder = NettyServerBuilder.forAddress(address);
- logger.info("Server started, host {} listening on {}", host, port);
- }
-
- @Override public void start() throws ServerException {
- try {
- server = nettyServerBuilder.build();
- server.start();
- } catch (IOException e) {
- throw new GRPCServerException(e.getMessage(), e);
- }
- }
-
- @Override public void addHandler(ServerHandler handler) {
- nettyServerBuilder.addService((io.grpc.BindableService)handler);
- }
-}
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java
deleted file mode 100644
index fd1845de590d..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/grpc/GRPCServerException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.grpc;
-
-import org.skywalking.apm.collector.server.ServerException;
-
-/**
- * @author peng-yongsheng
- */
-public class GRPCServerException extends ServerException {
-
- public GRPCServerException(String message) {
- super(message);
- }
-
- public GRPCServerException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/ArgumentsParseException.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/ArgumentsParseException.java
deleted file mode 100644
index 9e42d28a7f93..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/ArgumentsParseException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.jetty;
-
-import org.skywalking.apm.collector.core.CollectorException;
-
-/**
- * @author peng-yongsheng
- */
-public class ArgumentsParseException extends CollectorException {
-
- public ArgumentsParseException(String message) {
- super(message);
- }
-
- public ArgumentsParseException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyHandler.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyHandler.java
deleted file mode 100644
index 36608ded376f..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyHandler.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.jetty;
-
-import com.google.gson.JsonElement;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.skywalking.apm.collector.core.util.ObjectUtils;
-import org.skywalking.apm.collector.server.ServerHandler;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class JettyHandler extends HttpServlet implements ServerHandler {
-
- public abstract String pathSpec();
-
- @Override
- protected final void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- try {
- reply(resp, doGet(req));
- } catch (ArgumentsParseException e) {
- replyError(resp, e.getMessage(), HttpServletResponse.SC_BAD_REQUEST);
- }
- }
-
- protected abstract JsonElement doGet(HttpServletRequest req) throws ArgumentsParseException;
-
- @Override
- protected final void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- try {
- reply(resp, doPost(req));
- } catch (ArgumentsParseException e) {
- replyError(resp, e.getMessage(), HttpServletResponse.SC_BAD_REQUEST);
- }
- }
-
- protected abstract JsonElement doPost(HttpServletRequest req) throws ArgumentsParseException;
-
- @Override
- protected final void doHead(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- super.doHead(req, resp);
- }
-
- @Override protected final long getLastModified(HttpServletRequest req) {
- return super.getLastModified(req);
- }
-
- @Override
- protected final void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- super.doPut(req, resp);
- }
-
- @Override
- protected final void doDelete(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException, IOException {
- super.doDelete(req, resp);
- }
-
- @Override
- protected final void doOptions(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException, IOException {
- super.doOptions(req, resp);
- }
-
- @Override
- protected final void doTrace(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException, IOException {
- super.doTrace(req, resp);
- }
-
- @Override
- protected final void service(HttpServletRequest req,
- HttpServletResponse resp) throws ServletException, IOException {
- super.service(req, resp);
- }
-
- @Override public final void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
- super.service(req, res);
- }
-
- @Override public final void destroy() {
- super.destroy();
- }
-
- @Override public final String getInitParameter(String name) {
- return super.getInitParameter(name);
- }
-
- @Override public final Enumeration getInitParameterNames() {
- return super.getInitParameterNames();
- }
-
- @Override public final ServletConfig getServletConfig() {
- return super.getServletConfig();
- }
-
- @Override public final ServletContext getServletContext() {
- return super.getServletContext();
- }
-
- @Override public final String getServletInfo() {
- return super.getServletInfo();
- }
-
- @Override public final void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- @Override public final void init() throws ServletException {
- super.init();
- }
-
- @Override public final void log(String msg) {
- super.log(msg);
- }
-
- @Override public final void log(String message, Throwable t) {
- super.log(message, t);
- }
-
- @Override public final String getServletName() {
- return super.getServletName();
- }
-
- private void reply(HttpServletResponse response, JsonElement resJson) throws IOException {
- response.setContentType("text/json");
- response.setCharacterEncoding("utf-8");
- response.setStatus(HttpServletResponse.SC_OK);
-
- PrintWriter out = response.getWriter();
- if (ObjectUtils.isNotEmpty(resJson)) {
- out.print(resJson);
- }
- out.flush();
- out.close();
- }
-
- private void replyError(HttpServletResponse response, String errorMessage, int status) throws IOException {
- response.setContentType("text/plain");
- response.setCharacterEncoding("utf-8");
- response.setStatus(status);
- response.setHeader("error-message", errorMessage);
-
- PrintWriter out = response.getWriter();
- out.flush();
- out.close();
- }
-}
\ No newline at end of file
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java
deleted file mode 100644
index a606e97265b5..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServer.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.jetty;
-
-import java.net.InetSocketAddress;
-import javax.servlet.http.HttpServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.servlet.ServletMapping;
-import org.skywalking.apm.collector.server.Server;
-import org.skywalking.apm.collector.server.ServerException;
-import org.skywalking.apm.collector.server.ServerHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class JettyServer implements Server {
-
- private final Logger logger = LoggerFactory.getLogger(JettyServer.class);
-
- private final String host;
- private final int port;
- private final String contextPath;
- private org.eclipse.jetty.server.Server server;
- private ServletContextHandler servletContextHandler;
-
- public JettyServer(String host, int port, String contextPath) {
- this.host = host;
- this.port = port;
- this.contextPath = contextPath;
- }
-
- @Override public String hostPort() {
- return host + ":" + port;
- }
-
- @Override public String serverClassify() {
- return "Jetty";
- }
-
- @Override public void initialize() throws ServerException {
- server = new org.eclipse.jetty.server.Server(new InetSocketAddress(host, port));
-
- servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
- servletContextHandler.setContextPath(contextPath);
- logger.info("http server root context path: {}", contextPath);
-
- server.setHandler(servletContextHandler);
- }
-
- @Override public void addHandler(ServerHandler handler) {
- ServletHolder servletHolder = new ServletHolder();
- servletHolder.setServlet((HttpServlet)handler);
- servletContextHandler.addServlet(servletHolder, ((JettyHandler)handler).pathSpec());
- }
-
- @Override public void start() throws ServerException {
- logger.info("start server, host: {}, port: {}", host, port);
- try {
- for (ServletMapping servletMapping : servletContextHandler.getServletHandler().getServletMappings()) {
- logger.info("jetty servlet mappings: {} register by {}", servletMapping.getPathSpecs(), servletMapping.getServletName());
- }
- server.start();
- } catch (Exception e) {
- throw new JettyServerException(e.getMessage(), e);
- }
- }
-}
diff --git a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java b/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java
deleted file mode 100644
index a7ff6a3bfe12..000000000000
--- a/apm-collector/apm-collector-component/server-component/src/main/java/org/skywalking/apm/collector/server/jetty/JettyServerException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.server.jetty;
-
-import org.skywalking.apm.collector.server.ServerException;
-
-/**
- * @author peng-yongsheng
- */
-public class JettyServerException extends ServerException {
-
- public JettyServerException(String message) {
- super(message);
- }
-
- public JettyServerException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-core/pom.xml b/apm-collector/apm-collector-core/pom.xml
deleted file mode 100644
index 99b596a91f05..000000000000
--- a/apm-collector/apm-collector-core/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- apm-collector
- org.skywalking
- 3.3.0-2017
-
- 4.0.0
-
- apm-collector-core
- jar
-
-
-
- com.google.code.gson
- gson
- 2.8.1
-
-
-
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/CollectorException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/CollectorException.java
deleted file mode 100644
index ba459eeebbf3..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/CollectorException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core;
-
-/**
- * @author peng-yongsheng
- */
-public class CollectorException extends Exception {
-
- public CollectorException(String message) {
- super(message);
- }
-
- public CollectorException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/UnexpectedException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/UnexpectedException.java
deleted file mode 100644
index bc50de65d7aa..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/UnexpectedException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core;
-
-/**
- * @author wu-sheng
- */
-public class UnexpectedException extends RuntimeException {
- public UnexpectedException(String message) {
- super(message);
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cache/Collection.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cache/Collection.java
deleted file mode 100644
index fe20032218e0..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cache/Collection.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.cache;
-
-/**
- * @author peng-yongsheng
- */
-public interface Collection {
-
- void reading();
-
- boolean isReading();
-
- void writing();
-
- boolean isWriting();
-
- void clear();
-
- int size();
-
- void finishReading();
-
- void finishWriting();
-
- Data collection();
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cache/Window.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cache/Window.java
deleted file mode 100644
index 90e62e82473d..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/cache/Window.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.cache;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class Window {
-
- private AtomicInteger windowSwitch = new AtomicInteger(0);
-
- private WINDOW_COLLECTION pointer;
-
- private WINDOW_COLLECTION windowDataA;
- private WINDOW_COLLECTION windowDataB;
-
- protected Window() {
- this.windowDataA = collectionInstance();
- this.windowDataB = collectionInstance();
- this.pointer = windowDataA;
- }
-
- public abstract WINDOW_COLLECTION collectionInstance();
-
- public boolean trySwitchPointer() {
- return windowSwitch.incrementAndGet() == 1 && !getLast().isReading();
- }
-
- public void trySwitchPointerFinally() {
- windowSwitch.addAndGet(-1);
- }
-
- public void switchPointer() {
- if (pointer == windowDataA) {
- pointer = windowDataB;
- } else {
- pointer = windowDataA;
- }
- getLast().reading();
- }
-
- protected WINDOW_COLLECTION getCurrentAndWriting() {
- if (pointer == windowDataA) {
- windowDataA.writing();
- return windowDataA;
- } else {
- windowDataB.writing();
- return windowDataB;
- }
- }
-
- protected WINDOW_COLLECTION getCurrent() {
- return pointer;
- }
-
- public WINDOW_COLLECTION getLast() {
- if (pointer == windowDataA) {
- return windowDataB;
- } else {
- return windowDataA;
- }
- }
-
- public void finishReadingLast() {
- getLast().clear();
- getLast().finishReading();
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AbstractHashMessage.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AbstractHashMessage.java
deleted file mode 100644
index fbe4f7131f02..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AbstractHashMessage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * The AbstractHashMessage implementations represent aggregate message,
- * which use to aggregate metric.
- *
- *
- * @author peng-yongsheng
- * @since v3.0-2017
- */
-public abstract class AbstractHashMessage {
- private int hashCode;
-
- public AbstractHashMessage(String key) {
- this.hashCode = key.hashCode();
- }
-
- public int getHashCode() {
- return hashCode;
- }
-
- public void setKey(String key) {
- this.hashCode = key.hashCode();
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Attribute.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Attribute.java
deleted file mode 100644
index d1accabf8f4e..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Attribute.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * @author peng-yongsheng
- */
-public class Attribute {
- private final String name;
- private final AttributeType type;
- private final Operation operation;
-
- public Attribute(String name, AttributeType type, Operation operation) {
- this.name = name;
- this.type = type;
- this.operation = operation;
- }
-
- public String getName() {
- return name;
- }
-
- public AttributeType getType() {
- return type;
- }
-
- public Operation getOperation() {
- return operation;
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AttributeType.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AttributeType.java
deleted file mode 100644
index 2549c2059698..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AttributeType.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * @author peng-yongsheng
- */
-public enum AttributeType {
- STRING, LONG, DOUBLE, INTEGER, BYTE, BOOLEAN
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Column.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Column.java
deleted file mode 100644
index 3b2d0ea4b64a..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Column.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * @author peng-yongsheng
- */
-public class Column {
- private final String name;
- private final Operation operation;
-
- public Column(String name, Operation operation) {
- this.name = name;
- this.operation = operation;
- }
-
- public String getName() {
- return name;
- }
-
- public Operation getOperation() {
- return operation;
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/ColumnDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/ColumnDefine.java
deleted file mode 100644
index cedde598f7b9..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/ColumnDefine.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class ColumnDefine {
- private final String name;
- private final String type;
-
- public ColumnDefine(String name, String type) {
- this.name = name;
- this.type = type;
- }
-
- public final String getName() {
- return name;
- }
-
- public String getType() {
- return type;
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/CommonTable.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/CommonTable.java
deleted file mode 100644
index 92046a30e980..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/CommonTable.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * @author peng-yongsheng
- */
-public class CommonTable {
- public static final String TABLE_TYPE = "type";
- public static final String COLUMN_ID = "id";
- public static final String COLUMN_AGG = "agg";
- public static final String COLUMN_TIME_BUCKET = "time_bucket";
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java
deleted file mode 100644
index cb0eb02df045..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Data.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class Data extends EndOfBatchQueueMessage {
- private String[] dataStrings;
- private Long[] dataLongs;
- private Double[] dataDoubles;
- private Integer[] dataIntegers;
- private Boolean[] dataBooleans;
- private byte[][] dataBytes;
- private final Column[] stringColumns;
- private final Column[] longColumns;
- private final Column[] doubleColumns;
- private final Column[] integerColumns;
- private final Column[] booleanColumns;
- private final Column[] byteColumns;
-
- public Data(String id, Column[] stringColumns, Column[] longColumns, Column[] doubleColumns,
- Column[] integerColumns, Column[] booleanColumns, Column[] byteColumns) {
- super(id);
- this.dataStrings = new String[stringColumns.length];
- this.dataStrings[0] = id;
- this.dataLongs = new Long[longColumns.length];
- this.dataDoubles = new Double[doubleColumns.length];
- this.dataIntegers = new Integer[integerColumns.length];
- this.dataBooleans = new Boolean[booleanColumns.length];
- this.dataBytes = new byte[byteColumns.length][];
- this.stringColumns = stringColumns;
- this.longColumns = longColumns;
- this.doubleColumns = doubleColumns;
- this.integerColumns = integerColumns;
- this.booleanColumns = booleanColumns;
- this.byteColumns = byteColumns;
- }
-
- public int getDataStringsCount() {
- return dataStrings.length;
- }
-
- public int getDataLongsCount() {
- return dataLongs.length;
- }
-
- public int getDataDoublesCount() {
- return dataDoubles.length;
- }
-
- public int getDataIntegersCount() {
- return dataIntegers.length;
- }
-
- public int getDataBooleansCount() {
- return dataBooleans.length;
- }
-
- public int getDataBytesCount() {
- return dataBytes.length;
- }
-
- public void setDataString(int position, String value) {
- dataStrings[position] = value;
- }
-
- public void setDataLong(int position, Long value) {
- dataLongs[position] = value;
- }
-
- public void setDataDouble(int position, Double value) {
- dataDoubles[position] = value;
- }
-
- public void setDataInteger(int position, Integer value) {
- dataIntegers[position] = value;
- }
-
- public void setDataBoolean(int position, Boolean value) {
- dataBooleans[position] = value;
- }
-
- public void setDataBytes(int position, byte[] dataBytes) {
- this.dataBytes[position] = dataBytes;
- }
-
- public String getDataString(int position) {
- return dataStrings[position];
- }
-
- public Long getDataLong(int position) {
- return dataLongs[position];
- }
-
- public Double getDataDouble(int position) {
- return dataDoubles[position];
- }
-
- public Integer getDataInteger(int position) {
- return dataIntegers[position];
- }
-
- public Boolean getDataBoolean(int position) {
- return dataBooleans[position];
- }
-
- public byte[] getDataBytes(int position) {
- return dataBytes[position];
- }
-
- public String getId() {
- return dataStrings[0];
- }
-
- public void setId(String id) {
- setKey(id);
- this.dataStrings[0] = id;
- }
-
- public void mergeData(Data newData) {
- for (int i = 0; i < stringColumns.length; i++) {
- String stringData = stringColumns[i].getOperation().operate(newData.getDataString(i), this.dataStrings[i]);
- this.dataStrings[i] = stringData;
- }
- for (int i = 0; i < longColumns.length; i++) {
- Long longData = longColumns[i].getOperation().operate(newData.getDataLong(i), this.dataLongs[i]);
- this.dataLongs[i] = longData;
- }
- for (int i = 0; i < doubleColumns.length; i++) {
- Double doubleData = doubleColumns[i].getOperation().operate(newData.getDataDouble(i), this.dataDoubles[i]);
- this.dataDoubles[i] = doubleData;
- }
- for (int i = 0; i < integerColumns.length; i++) {
- Integer integerData = integerColumns[i].getOperation().operate(newData.getDataInteger(i), this.dataIntegers[i]);
- this.dataIntegers[i] = integerData;
- }
- for (int i = 0; i < booleanColumns.length; i++) {
- Boolean booleanData = booleanColumns[i].getOperation().operate(newData.getDataBoolean(i), this.dataBooleans[i]);
- this.dataBooleans[i] = booleanData;
- }
- for (int i = 0; i < byteColumns.length; i++) {
- byte[] byteData = byteColumns[i].getOperation().operate(newData.getDataBytes(i), this.dataBytes[i]);
- this.dataBytes[i] = byteData;
- }
- }
-
- @Override public String toString() {
- StringBuilder dataStr = new StringBuilder();
- dataStr.append("string: [");
- for (String dataString : dataStrings) {
- dataStr.append(dataString).append(",");
- }
- dataStr.append("], longs: [");
- for (Long dataLong : dataLongs) {
- dataStr.append(dataLong).append(",");
- }
- dataStr.append("], double: [");
- for (Double dataDouble : dataDoubles) {
- dataStr.append(dataDouble).append(",");
- }
- dataStr.append("], integer: [");
- for (Integer dataInteger : dataIntegers) {
- dataStr.append(dataInteger).append(",");
- }
- dataStr.append("], boolean: [");
- for (Boolean dataBoolean : dataBooleans) {
- dataStr.append(dataBoolean).append(",");
- }
- dataStr.append("]");
- return dataStr.toString();
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/EndOfBatchQueueMessage.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/EndOfBatchQueueMessage.java
deleted file mode 100644
index d0647db80be6..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/EndOfBatchQueueMessage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class EndOfBatchQueueMessage extends AbstractHashMessage {
-
- private boolean endOfBatch;
-
- public EndOfBatchQueueMessage(String key) {
- super(key);
- endOfBatch = false;
- }
-
- public final boolean isEndOfBatch() {
- return endOfBatch;
- }
-
- public final void setEndOfBatch(boolean endOfBatch) {
- this.endOfBatch = endOfBatch;
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Operation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Operation.java
deleted file mode 100644
index f5c130438ee7..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Operation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-/**
- * @author peng-yongsheng
- */
-public interface Operation {
- String operate(String newValue, String oldValue);
-
- Long operate(Long newValue, Long oldValue);
-
- Double operate(Double newValue, Double oldValue);
-
- Integer operate(Integer newValue, Integer oldValue);
-
- Boolean operate(Boolean newValue, Boolean oldValue);
-
- byte[] operate(byte[] newValue, byte[] oldValue);
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefineLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefineLoader.java
deleted file mode 100644
index d0ca17f7f895..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefineLoader.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-import java.util.LinkedList;
-import java.util.List;
-import org.skywalking.apm.collector.core.define.DefineException;
-import org.skywalking.apm.collector.core.define.DefinitionLoader;
-import org.skywalking.apm.collector.core.define.Loader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class StorageDefineLoader implements Loader> {
-
- private final Logger logger = LoggerFactory.getLogger(StorageDefineLoader.class);
-
- @Override public List load() throws DefineException {
- List tableDefines = new LinkedList<>();
-
- StorageDefinitionFile definitionFile = new StorageDefinitionFile();
- logger.info("storage definition file name: {}", definitionFile.fileName());
- DefinitionLoader definitionLoader = DefinitionLoader.load(TableDefine.class, definitionFile);
- for (TableDefine tableDefine : definitionLoader) {
- logger.info("loaded storage definition class: {}", tableDefine.getClass().getName());
- tableDefines.add(tableDefine);
- }
- return tableDefines;
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefinitionFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefinitionFile.java
deleted file mode 100644
index 304deb10b687..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefinitionFile.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-import org.skywalking.apm.collector.core.define.DefinitionFile;
-
-/**
- * @author peng-yongsheng
- */
-public class StorageDefinitionFile extends DefinitionFile {
- @Override protected String fileName() {
- return "storage.define";
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/TableDefine.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/TableDefine.java
deleted file mode 100644
index 662d592519d3..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/TableDefine.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class TableDefine {
- private final String name;
- private final List columnDefines;
-
- public TableDefine(String name) {
- this.name = name;
- this.columnDefines = new LinkedList<>();
- }
-
- public abstract void initialize();
-
- public final void addColumn(ColumnDefine columnDefine) {
- columnDefines.add(columnDefine);
- }
-
- public final String getName() {
- return name;
- }
-
- public final List getColumnDefines() {
- return columnDefines;
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/AddOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/AddOperation.java
deleted file mode 100644
index eaa5c7ecd85a..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/AddOperation.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data.operator;
-
-import org.skywalking.apm.collector.core.data.Operation;
-
-/**
- * @author peng-yongsheng
- */
-public class AddOperation implements Operation {
-
- @Override public String operate(String newValue, String oldValue) {
- throw new UnsupportedOperationException("not support string addition operation");
- }
-
- @Override public Long operate(Long newValue, Long oldValue) {
- return newValue + oldValue;
- }
-
- @Override public Double operate(Double newValue, Double oldValue) {
- return newValue + oldValue;
- }
-
- @Override public Integer operate(Integer newValue, Integer oldValue) {
- return newValue + oldValue;
- }
-
- @Override public Boolean operate(Boolean newValue, Boolean oldValue) {
- throw new UnsupportedOperationException("not support boolean addition operation");
- }
-
- @Override public byte[] operate(byte[] newValue, byte[] oldValue) {
- throw new UnsupportedOperationException("not support byte addition operation");
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/CoverOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/CoverOperation.java
deleted file mode 100644
index 6f367581952c..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/CoverOperation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data.operator;
-
-import org.skywalking.apm.collector.core.data.Operation;
-
-/**
- * @author peng-yongsheng
- */
-public class CoverOperation implements Operation {
- @Override public String operate(String newValue, String oldValue) {
- return newValue;
- }
-
- @Override public Long operate(Long newValue, Long oldValue) {
- return newValue;
- }
-
- @Override public Double operate(Double newValue, Double oldValue) {
- return newValue;
- }
-
- @Override public Integer operate(Integer newValue, Integer oldValue) {
- return newValue;
- }
-
- @Override public Boolean operate(Boolean newValue, Boolean oldValue) {
- return newValue;
- }
-
- @Override public byte[] operate(byte[] newValue, byte[] oldValue) {
- return newValue;
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/NonOperation.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/NonOperation.java
deleted file mode 100644
index 97a261bae79a..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/NonOperation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.data.operator;
-
-import org.skywalking.apm.collector.core.data.Operation;
-
-/**
- * @author peng-yongsheng
- */
-public class NonOperation implements Operation {
- @Override public String operate(String newValue, String oldValue) {
- return oldValue;
- }
-
- @Override public Long operate(Long newValue, Long oldValue) {
- return oldValue;
- }
-
- @Override public Double operate(Double newValue, Double oldValue) {
- return oldValue;
- }
-
- @Override public Integer operate(Integer newValue, Integer oldValue) {
- return oldValue;
- }
-
- @Override public Boolean operate(Boolean newValue, Boolean oldValue) {
- return oldValue;
- }
-
- @Override public byte[] operate(byte[] newValue, byte[] oldValue) {
- return oldValue;
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefineException.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefineException.java
deleted file mode 100644
index 281d22d6355b..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefineException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.define;
-
-import org.skywalking.apm.collector.core.CollectorException;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class DefineException extends CollectorException {
-
- public DefineException(String message) {
- super(message);
- }
-
- public DefineException(String message, Throwable cause) {
- super(message, cause);
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefinitionFile.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefinitionFile.java
deleted file mode 100644
index be2915e26b8c..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefinitionFile.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.define;
-
-/**
- * @author peng-yongsheng
- */
-public abstract class DefinitionFile {
-
- private static final String CATALOG = "META-INF/defines/";
-
- protected abstract String fileName();
-
- public final String get() {
- return CATALOG + fileName();
- }
-}
diff --git a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefinitionLoader.java b/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefinitionLoader.java
deleted file mode 100644
index 363cd805a337..000000000000
--- a/apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/define/DefinitionLoader.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed 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 repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.core.define;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Properties;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class DefinitionLoader implements Iterable {
-
- private final Logger logger = LoggerFactory.getLogger(DefinitionLoader.class);
-
- private final Class definition;
- private final DefinitionFile definitionFile;
-
- protected DefinitionLoader(Class svc, DefinitionFile definitionFile) {
- this.definition = Objects.requireNonNull(svc, "definition interface cannot be null");
- this.definitionFile = definitionFile;
- }
-
- public static DefinitionLoader load(Class definition, DefinitionFile definitionFile) {
- return new DefinitionLoader(definition, definitionFile);
- }
-
- @Override public final Iterator iterator() {
- logger.info("load definition file: {}", definitionFile.get());
- List
+
+ Thank you for finding the time to report the problem! We really appreciate the community efforts to improve SkyWalking.
+
+ Please make sure what you are reporting is indeed a bug with reproducible steps, if you want to ask questions
+ or share ideas, please [subscribe to our mailing list](mailto:dev-subscribe@skywalking.apache.org) and sent
+ emails to [our mailing list](mailto:dev@skywalking.apache.org), you can also head to our
+ [Discussion](https://github.com/apache/skywalking/discussions) tab.
+
+ - type: checkboxes
+ attributes:
+ label: Search before asking
+ description: >
+ Please make sure to search in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) first to see
+ whether the same issue was reported already.
+ options:
+ - label: >
+ I had searched in the [issues](https://github.com/apache/skywalking/issues?q=is%3Aissue) and found no similar
+ issues.
+ required: true
+
+ - type: dropdown
+ attributes:
+ label: Apache SkyWalking Component
+ description: |
+ What Apache SkyWalking component are you using? Apache SkyWalking has many subprojects, please make sure
+ to choose the component that you found the bug. For non-Apache community projects, please refer to their
+ corresponding repos.
+ multiple: false
+ options:
+ - "OAP server (apache/skywalking)"
+ - "UI (apache/skywalking-booster-ui)"
+ - "Java Agent (apache/skywalking-java)"
+ - "Python Agent (apache/skywalking-python)"
+ - "NodeJS Server Side Agent (apache/skywalking-nodejs)"
+ - "NodeJS Client Side Agent (apache/skywalking-client-js)"
+ - "Nginx Lua Agent (apache/skywalking-nginx-lua)"
+ - "Kong Agent (apache/skywalking-kong)"
+ - "Go Agent (apache/skywalking-go)"
+ - "PHP (apache/skywalking-php)"
+ - "Rust (apache/skywalking-rust)"
+ - "Satellite (apache/skywalking-satellite)"
+ - "CLI (apache/skywalking-cli)"
+ - "Helm Chart (apache/skywalking-helm)"
+ - "SWCK (apache/skywalking-swck)"
+ - "License Tools (apache/skywalking-eyes)"
+ - "Infra E2E (apache/skywalking-infra-e2e)"
+ - "BanyanDB (apache/skywalking-banyandb)"
+ - "Agent Test Tool (apache/skywalking-agent-test-tool)"
+ - "Showcase (apache/skywalking-showcase)"
+ validations:
+ required: true
+
+ - type: textarea
+ attributes:
+ label: What happened
+ description: Describe what happened.
+ placeholder: >
+ Please provide the context in which the problem occurred and explain what happened
+ validations:
+ required: true
+
+ - type: textarea
+ attributes:
+ label: What you expected to happen
+ description: What do you think went wrong?
+ placeholder: >
+ Please explain why you think the behaviour is erroneous. It is extremely helpful if you copy and paste
+ the fragment of logs showing the exact error messages or wrong behaviour and screenshots for
+ UI problems. You can include files by dragging and dropping them here.
+
+ **NOTE**: please copy and paste texts instead of taking screenshots of them for easy future search.
+ validations:
+ required: true
+
+ - type: textarea
+ attributes:
+ label: How to reproduce
+ description: >
+ What should we do to reproduce the problem? If you are not able to provide a reproducible case,
+ please open a [Discussion](https://github.com/apache/skywalking/discussions) instead.
+ placeholder: >
+ Please make sure you provide a reproducible step-by-step case of how to reproduce the problem
+ as minimally and precisely as possible. Keep in mind we do not have access to your deployment.
+ Remember that non-reproducible issues will be closed! Opening a discussion is recommended as a
+ first step.
+ validations:
+ required: true
+
+ - type: textarea
+ attributes:
+ label: Anything else
+ description: Anything else we need to know?
+ placeholder: >
+ How often does this problem occur? (Once? Every time? Only when certain conditions are met?)
+ Any relevant logs to include? Put them here inside fenced
+ ``` ``` blocks or inside a collapsable details tag if it's too long:
+ 
+
-**SkyWalking 3**: APM for Distributed Systems, also known Distributed Tracing System.
+**SkyWalking**: an APM (Application Performance Monitoring) system, especially designed for
+microservices, cloud native and container-based architectures.
-[](https://travis-ci.org/OpenSkywalking/skywalking)
-[](https://coveralls.io/github/OpenSkywalking/skywalking?branch=master)
-[](https://gitter.im/openskywalking/Lobby)
-[](http://opentracing.io)
+[](https://github.com/apache/skywalking)
+[](https://x.com/AsfSkyWalking)
-* Provide Java agent, **no need to CHANGE any application source code**.
- * High performance agent. Only increase extra **10%** cpu cost in 5000+ tps application, even **when collect all traces**.
- * [Supported middlewares, frameworks and libraries](docs/Supported-list.md).
-* Manual instrumentation
- * As an [OpenTracing supported tracer](http://opentracing.io/documentation/pages/supported-tracers)
- * Use **@Trace** annotation for any methods you want to trace.
- * Integrate traceId into logs for log4j, log4j2 and logback.
-* Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs.
-* The UI released on [skywalking-ui](https://github.com/OpenSkywalking/sky-walking-ui)
+
-# Architecture
-* Architecture graph for 3.2.5+
-
+# Abstract
+**SkyWalking** is an open-source APM system that provides monitoring, tracing and diagnosing capabilities for distributed systems in Cloud Native architectures.
-# Document
-[](docs/README.md) [](docs/README_ZH.md)
-This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com.
+* Distributed Tracing
+ * End-to-end distributed tracing. Service topology analysis, service-centric observability and APIs dashboards.
+* Agents for your stack
+ * Java, .Net Core, PHP, NodeJS, Golang, LUA, Rust, C++, Client JavaScript and Python agents with active development and maintenance.
+* eBPF early adoption
+ * Rover agent works as a monitor and profiler powered by eBPF to monitor Kubernetes deployments and diagnose CPU and network performance.
+* Scaling
+ * 100+ billion telemetry data could be collected and analyzed from one SkyWalking cluster.
+* Mature Telemetry Ecosystems Supported
+ * Metrics, Traces, and Logs from mature ecosystems are supported, e.g. Zipkin, OpenTelemetry, Prometheus, Zabbix, Fluentd
+* Native APM Database
+ * BanyanDB, an observability database, created in 2022, aims to ingest, analyze and store telemetry/observability data.
+* Consistent Metrics Aggregation
+ * SkyWalking native meter format and widely known metrics format(OpenTelemetry, Telegraf, Zabbix, e.g.) are processed through the same script pipeline.
+* Log Management Pipeline
+ * Support log formatting, extract metrics, various sampling policies through script pipeline in high performance.
+* Alerting and Telemetry Pipelines
+ * Support service-centric, deployment-centric, API-centric alarm rule setting. Support forwarding alarms and all telemetry data to 3rd party.
+* AI Power Enabled
+ * Machine Learning (ML) and Artificial Intelligence (AI) analyze observability data to identify patterns and enhance capabilities, such as recognizing HTTP URI patterns and automatically calculating metric baselines for intelligent alerting, improving anomaly detection.
-# Screenshots
-- Discovery topological graph of application clusters automatically.
-
+
-- Trace query.
-
+# Live Demo
+- Find the [SkyWalking live demo with native UI and Grafana](https://skywalking.apache.org/#demo), and [screenshots](https://skywalking.apache.org/#arch) on our website.
+- Follow the [showcase](https://skywalking.apache.org/docs/skywalking-showcase/next/readme/) to set up a preview deployment quickly.
-- Span detail.
-
+# Documentation
+- [Official documentation](https://skywalking.apache.org/docs/#SkyWalking)
-- Instance Overview.
-
+# Downloads
+Please head to the [releases page](https://skywalking.apache.org/downloads/) to download a release of Apache SkyWalking.
-- JVM Detail.
-
+# Compiling project
+Follow this [document](docs/en/guides/How-to-build.md).
-- Services Dependency Tree.
-
-
-# Test reports
-- Automatic integration test reports
- - [Java Agent test report](https://github.com/SkywalkingTest/agent-integration-test-report)
-- Performance test reports
- - [Java Agent test report](https://skywalkingtest.github.io/Agent-Benchmarks/)
+# Code of conduct
+This project adheres to the Contributor Covenant [code of conduct](https://www.apache.org/foundation/policies/conduct). By participating, you are expected to uphold this code.
+Please follow the [REPORTING GUIDELINES](https://www.apache.org/foundation/policies/conduct#reporting-guidelines) to report unacceptable behavior.
# Contact Us
-* Submit an issue
-* [Gitter](https://gitter.im/openskywalking/Lobby)
-* [Google Mailing List](https://groups.google.com/forum/#!forum/skywalking-distributed-tracing-and-apm)
-* QQ Group: 392443393
-
-# Open Skywalking Organization
-[Open Skywalking Organization Teams and Contributors](https://github.com/OpenSkywalking/Organization/blob/master/README.md)
-
-# Partners
-
+* Mail list: **dev@skywalking.apache.org**. Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the mail list.
+* Send `Request to join SkyWalking slack` mail to the mail list(`dev@skywalking.apache.org`), we will invite you in.
+* For Chinese speaker, send `[CN] Request to join SkyWalking slack` mail to the mail list(`dev@skywalking.apache.org`), we will invite you in.
+* Twitter, [ASFSkyWalking](https://twitter.com/AsfSkyWalking)
+* [bilibili B站 视频](https://space.bilibili.com/390683219)
+* [掘金](https://juejin.cn/user/13673577331607/posts)
+
+# Our Users
+Hundreds of companies and organizations use SkyWalking for research, production, and commercial purposes.
+Visit our [website](http://skywalking.apache.org/users/) to find the user page.
# License
-[Apache 2.0 License.](/LICENSE)
+[Apache 2.0 License.](LICENSE)
diff --git a/README_ZH.md b/README_ZH.md
deleted file mode 100644
index 3d92f9357076..000000000000
--- a/README_ZH.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Sky Walking | [English](README.md)
-==========
-
-
-
-- 调用链查询
-