Merge pull request #64 from sourceplusplus/dev

v0.4.7

Author: BFergerson

.github/workflows/build.yml

@@ -47,17 +47,17 @@ jobs:
       - name: Set SPP_PLATFORM_HOST
         run: SPP_PLATFORM_HOST=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aqf "name=spp-platform")) && echo "SPP_PLATFORM_HOST=$SPP_PLATFORM_HOST" >> $GITHUB_ENV
       - name: Wait for platform
-        run: until $(curl --insecure --output /dev/null --silent --fail https://localhost:5445/api/new-token?access_token=change-me); do printf '.'; sleep 5; done && SPP_JWT_TOKEN=$(curl --insecure https://localhost:5445/api/new-token?access_token=change-me) && echo "SPP_JWT_TOKEN=$SPP_JWT_TOKEN" >> $GITHUB_ENV
+        run: until $(curl --insecure --output /dev/null --silent --fail https://localhost:12800/api/new-token?access_token=change-me); do printf '.'; sleep 5; done && SPP_JWT_TOKEN=$(curl --insecure https://localhost:12800/api/new-token?access_token=change-me) && echo "SPP_JWT_TOKEN=$SPP_JWT_TOKEN" >> $GITHUB_ENV
       - name: Wait for skywalking
         run: |
-          until $(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure --output /dev/null --silent --fail https://localhost:5445/health); do printf '.'; sleep 5; done
+          until $(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure --output /dev/null --silent --fail https://localhost:12800/health); do printf '.'; sleep 5; done
 
       #todo: create health for TraceSegmentServiceClient.statusChanged()
       - run: sleep 45s
 
       - name: Verify probe connected
         run: |
-          resp=$(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure https://localhost:5445/clients) && [[ $(echo $resp | jq -r ."probes"[0]."meta"."language") == "java" ]] && echo $resp || (echo $resp && exit 1)
+          resp=$(curl --header "Authorization: Bearer ${{ env.SPP_JWT_TOKEN }}" --insecure https://localhost:12800/clients) && [[ $(echo $resp | jq -r ."probes"[0]."meta"."language") == "java" ]] && echo $resp || (echo $resp && exit 1)
 
       - run: ./gradlew test -Dtest.profile=integration
 

e2e/docker-compose.yml

@@ -20,10 +20,10 @@ services:
     container_name: spp-platform
     hostname: spp-platform
     ports:
-      - "5445:5445"
       - "5450:5450"
       - "5455:5455"
       - "5107:5107"
+      - "12800:12800"
     environment:
       - SPP_LOGGING_LEVEL=trace
       - SPP_OAP_HOST=skywalking-oap

gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 
 probeGroup=spp.probe
-projectVersion=0.4.6
+projectVersion=0.4.7
 
 vertxVersion=4.2.6