Skip to content

Commit

Permalink
Initializing to use SkyWalking to replace Zipkin Server
Browse files Browse the repository at this point in the history
  • Loading branch information
mrproliu committed Sep 6, 2023
1 parent 15d36ea commit d19e392
Show file tree
Hide file tree
Showing 382 changed files with 1,396 additions and 38,869 deletions.
1 change: 1 addition & 0 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/helm_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v1
with:
submodules: true

- name: Configure Git
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/helm_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v1
with:
submodules: true

- name: Configure Git
run: |
Expand Down
35 changes: 3 additions & 32 deletions .github/workflows/readme_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 &&
Expand All @@ -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
72 changes: 0 additions & 72 deletions .github/workflows/test.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "skywalking"]
path = skywalking
url = https://github.com/apache/skywalking.git
23 changes: 0 additions & 23 deletions benchmarks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
95 changes: 0 additions & 95 deletions benchmarks/src/main/java/zipkin2/collector/MetricsBenchmarks.java

This file was deleted.

Loading

0 comments on commit d19e392

Please sign in to comment.