Initializing to use SkyWalking to replace Zipkin Server in v3 (#3564)

openzipkin · Sep 7, 2023 · 47e6428 · 47e6428
1 parent 15d36ea
commit 47e6428
Show file tree

Hide file tree

Showing 382 changed files with 1,467 additions and 38,868 deletions.
diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml
@@ -20,6 +20,7 @@ jobs:
           # the tag MAJOR.MINOR.PATCH event, but we still need to deploy the maven-release-plugin master commit.
           token: ${{ secrets.GH_TOKEN }}
           fetch-depth: 1  # only need the HEAD commit as license check isn't run
+          submodules: true
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -23,6 +23,7 @@ jobs:
           # We push Javadocs to the gh-pages branch on commit.
           token: ${{ secrets.GH_TOKEN }}
           fetch-depth: 0  # allow build-bin/idl_to_gh_pages to get the full history
+          submodules: true
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml
@@ -17,6 +17,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 1  # only needed to get the sha label
+          submodules: true
       # We can't cache Docker without using buildx because GH actions restricts /var/lib/docker
       # That's ok because DOCKER_PARENT_IMAGE is always ghcr.io and local anyway.
       - name: Docker Push

diff --git a/.github/workflows/helm_release.yml b/.github/workflows/helm_release.yml
@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+        with:
+          submodules: true
 
       - name: Configure Git
         run: |

diff --git a/.github/workflows/helm_test.yml b/.github/workflows/helm_test.yml
@@ -16,6 +16,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v1
+        with:
+          submodules: true
 
       - name: Configure Git
         run: |

diff --git a/.github/workflows/readme_test.yml b/.github/workflows/readme_test.yml
@@ -30,6 +30,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 1
+          submodules: true
       # Setup latest JDK. We do this to ensure users don't need to use the same version as our
       # release process. Release uses JDK 11, the last version that can target 1.6 bytecode.
       - name: Setup java
@@ -82,7 +83,7 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
       - name: zipkin-server/README.md # Tests the build which is re-used for a few images
-        run: ./mvnw -T1C -q --batch-mode -DskipTests --also-make -pl zipkin-server clean package
+        run: ./mvnw -T1C -q --batch-mode -DskipTests -Dcheckstyle.skip=true --also-make -pl zipkin-server clean package
       - name: docker/README.md - openzipkin/zipkin
         run: |
           build-bin/docker/docker_build openzipkin/zipkin:test &&
@@ -102,34 +103,4 @@ jobs:
           build-bin/docker/docker_test_image openzipkin/zipkin-ui:test
         env:
           DOCKER_FILE: docker/test-images/zipkin-ui/Dockerfile
-          RELEASE_FROM_MAVEN_BUILD: true
-      - name: docker/test-images/zipkin-cassandra/README.md
-        run: |
-          build-bin/docker/docker_build openzipkin/zipkin-cassandra:test &&
-          build-bin/docker/docker_test_image openzipkin/zipkin-cassandra:test
-        env:
-          DOCKER_FILE: docker/test-images/zipkin-cassandra/Dockerfile
-      - name: docker/test-images/zipkin-elasticsearch6/README.md
-        run: |
-          build-bin/docker/docker_build openzipkin/zipkin-elasticsearch6:test &&
-          build-bin/docker/docker_test_image openzipkin/zipkin-elasticsearch6:test
-        env:
-          DOCKER_FILE: docker/test-images/zipkin-elasticsearch6/Dockerfile
-      - name: docker/test-images/zipkin-elasticsearch7/README.md
-        run: |
-          build-bin/docker/docker_build openzipkin/zipkin-elasticsearch7:test &&
-          build-bin/docker/docker_test_image openzipkin/zipkin-elasticsearch7:test
-        env:
-          DOCKER_FILE: docker/test-images/zipkin-elasticsearch7/Dockerfile
-      - name: docker/test-images/zipkin-kafka/README.md
-        run: |
-          build-bin/docker/docker_build openzipkin/zipkin-kafka:test &&
-          build-bin/docker/docker_test_image openzipkin/zipkin-kafka:test
-        env:
-          DOCKER_FILE: docker/test-images/zipkin-kafka/Dockerfile
-      - name: docker/test-images/zipkin-mysql/README.md
-        run: |
-          build-bin/docker/docker_build openzipkin/zipkin-mysql:test &&
-          build-bin/docker/docker_test_image openzipkin/zipkin-mysql:test
-        env:
-          DOCKER_FILE: docker/test-images/zipkin-mysql/Dockerfile
+          RELEASE_FROM_MAVEN_BUILD: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,72 +1,72 @@
 # yamllint --format github .github/workflows/test.yml
----
-name: test
-
-# We don't test documentation-only commits.
-on:
-  # We run tests on non-tagged pushes to master that aren't a commit made by the release plugin
-  push:
-    tags: ""
-    branches: master
-    paths-ignore:
-      - "**/*.md"
-      - "charts/**"
-  # We also run tests on pull requests targeted at the master branch.
-  pull_request:
-    branches: master
-    paths-ignore:
-      - "**/*.md"
-      - "charts/**"
-
-jobs:
-  test:
-    runs-on: ubuntu-20.04 # newest available distribution, aka focal
-    if: "!contains(github.event.head_commit.message, 'maven-release-plugin')"
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0 # full git history for license check
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
-      - name: Cache NPM Packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-npm-packages-${{ hashFiles('zipkin-lens/package-lock.json') }}
-      - name: Test without Docker
-        run: build-bin/maven_go_offline && build-bin/test -Ddocker.skip=true
-  test_docker:
-    runs-on: ubuntu-20.04 # newest available distribution, aka focal
-    if: "!contains(github.event.head_commit.message, 'maven-release-plugin')"
-    strategy:
-      matrix:
-        include:
-          - name: zipkin-collector-kafka
-          - name: zipkin-collector-rabbitmq
-          - name: zipkin-storage-cassandra
-          - name: zipkin-storage-elasticsearch
-          - name: zipkin-storage-mysql-v1
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1 # -Dlicense.skip=true so we don't need a full clone
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
-      # We can't cache Docker without using buildx because GH actions restricts /var/lib/docker
-      # That's ok because DOCKER_PARENT_IMAGE is always ghcr.io and local anyway.
-      - name: Test with Docker
-        run:
-          | # configure_test seeds NPM cache, which isn't needed for these tests
-          build-bin/maven/maven_go_offline &&
-          build-bin/docker/configure_docker &&
-          build-bin/test -pl :${{ matrix.name }} --am -Dlicense.skip=true
+#---
+#name: test
+#
+## We don't test documentation-only commits.
+#on:
+#  # We run tests on non-tagged pushes to master that aren't a commit made by the release plugin
+#  push:
+#    tags: ""
+#    branches: master
+#    paths-ignore:
+#      - "**/*.md"
+#      - "charts/**"
+#  # We also run tests on pull requests targeted at the master branch.
+#  pull_request:
+#    branches: master
+#    paths-ignore:
+#      - "**/*.md"
+#      - "charts/**"
+#
+#jobs:
+#  test:
+#    runs-on: ubuntu-20.04 # newest available distribution, aka focal
+#    if: "!contains(github.event.head_commit.message, 'maven-release-plugin')"
+#    steps:
+#      - name: Checkout Repository
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 0 # full git history for license check
+#      - name: Cache local Maven repository
+#        uses: actions/cache@v2
+#        with:
+#          path: ~/.m2/repository
+#          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+#          restore-keys: ${{ runner.os }}-maven-
+#      - name: Cache NPM Packages
+#        uses: actions/cache@v2
+#        with:
+#          path: ~/.npm
+#          key: ${{ runner.os }}-npm-packages-${{ hashFiles('zipkin-lens/package-lock.json') }}
+#      - name: Test without Docker
+#        run: build-bin/maven_go_offline && build-bin/test -Ddocker.skip=true
+#  test_docker:
+#    runs-on: ubuntu-20.04 # newest available distribution, aka focal
+#    if: "!contains(github.event.head_commit.message, 'maven-release-plugin')"
+#    strategy:
+#      matrix:
+#        include:
+#          - name: zipkin-collector-kafka
+#          - name: zipkin-collector-rabbitmq
+#          - name: zipkin-storage-cassandra
+#          - name: zipkin-storage-elasticsearch
+#          - name: zipkin-storage-mysql-v1
+#    steps:
+#      - name: Checkout Repository
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 1 # -Dlicense.skip=true so we don't need a full clone
+#      - name: Cache local Maven repository
+#        uses: actions/cache@v2
+#        with:
+#          path: ~/.m2/repository
+#          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+#          restore-keys: ${{ runner.os }}-maven-
+#      # We can't cache Docker without using buildx because GH actions restricts /var/lib/docker
+#      # That's ok because DOCKER_PARENT_IMAGE is always ghcr.io and local anyway.
+#      - name: Test with Docker
+#        run:
+#          | # configure_test seeds NPM cache, which isn't needed for these tests
+#          build-bin/maven/maven_go_offline &&
+#          build-bin/docker/configure_docker &&
+#          build-bin/test -pl :${{ matrix.name }} --am -Dlicense.skip=true
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,5 @@ _site/
 # This project does not use Yarn but some developers may use it to e.g., start zipkin-lens dev server.
 # It doesn't hurt to just exclude it here.
 yarn.lock
+
+zipkin-server/server-starter/src/main/resources/version.properties
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "skywalking"]
+	path = skywalking
+	url = https://github.com/apache/skywalking.git
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -105,11 +105,6 @@
       <artifactId>zipkin-server</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}.zipkin2</groupId>
-      <artifactId>zipkin-storage-elasticsearch</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.squareup.wire</groupId>
       <artifactId>wire-runtime</artifactId>
@@ -127,18 +122,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- zipkin-server optional dependencies for running ServerIntegratedBenchmark -->
-    <dependency>
-      <groupId>${project.groupId}.zipkin2</groupId>
-      <artifactId>zipkin-storage-cassandra</artifactId>
-      <version>${project.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>io.netty</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>com.datastax.oss</groupId>
       <artifactId>java-driver-core</artifactId>
@@ -151,12 +134,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}.zipkin2</groupId>
-      <artifactId>zipkin-storage-mysql-v1</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mariadb.jdbc</groupId>
       <artifactId>mariadb-java-client</artifactId>

diff --git a/benchmarks/src/main/java/zipkin2/collector/MetricsBenchmarks.java b/benchmarks/src/main/java/zipkin2/collector/MetricsBenchmarks.java