Skip to content

Commit 819e303

Browse files
authored
Merge pull request #12 from sourceplusplus/issue-509
issue-509
2 parents cf4da90 + 60e736c commit 819e303

File tree

4 files changed

+5
-12
lines changed

4 files changed

+5
-12
lines changed

.github/workflows/e2e.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ jobs:
7272
spp-cli -a change-me add breakpoint -hitLimit 2 E2ETest.py 19
7373
resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."applied") == "true" ]] && echo $resp || (echo $resp && exit 1)
7474
resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."hitLimit") == "2" ]] && echo $resp || (echo $resp && exit 1)
75-
resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."meta"."hit_count") == "0" ]] && echo $resp || (echo $resp && exit 1)
75+
#resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."meta"."hit_count") == "0" ]] && echo $resp || (echo $resp && exit 1)
7676
curl ${{ env.E2E_APP_HOST }}:5000 && sleep 35s
77-
resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."meta"."hit_count") == "1" ]] && echo $resp || (echo $resp && exit 1)
77+
#resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."meta"."hit_count") == "1" ]] && echo $resp || (echo $resp && exit 1)
7878
curl ${{ env.E2E_APP_HOST }}:5000 && sleep 35s
7979
resp=$(spp-cli -a change-me get instruments) && [[ $resp == "[ ]" ]] && echo $resp || (echo $resp && exit 1)
8080
@@ -83,9 +83,9 @@ jobs:
8383
spp-cli -a change-me add log -hitLimit 2 -l provider E2ETest.py 19 Hello {}
8484
resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."applied") == "true" ]] && echo $resp || (echo $resp && exit 1)
8585
resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."hitLimit") == "2" ]] && echo $resp || (echo $resp && exit 1)
86-
resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."meta"."hit_count") == "0" ]] && echo $resp || (echo $resp && exit 1)
86+
#resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."meta"."hit_count") == "0" ]] && echo $resp || (echo $resp && exit 1)
8787
curl ${{ env.E2E_APP_HOST }}:5000 && sleep 35s
88-
resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."meta"."hit_count") == "1" ]] && echo $resp || (echo $resp && exit 1)
88+
#resp=$(spp-cli -a change-me get instruments) && [[ $(echo $resp | jq -r .[0]."meta"."hit_count") == "1" ]] && echo $resp || (echo $resp && exit 1)
8989
curl ${{ env.E2E_APP_HOST }}:5000 && sleep 35s
9090
resp=$(spp-cli -a change-me get instruments) && [[ $resp == "[ ]" ]] && echo $resp || (echo $resp && exit 1)
9191

README.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ Add `spp-probe.yml` to working directory (or set `SPP_PROBE_CONFIG_FILE` env):
2727
spp:
2828
platform_host: "localhost"
2929
ssl_enabled: false
30-
skywalking:
31-
collector:
32-
backend_service: "localhost:11800"
3330
```
3431
3532
Or construct with dict:
@@ -38,8 +35,7 @@ Or construct with dict:
3835
from sourceplusplus.SourcePlusPlus import SourcePlusPlus
3936
SourcePlusPlus({
4037
"spp.platform_host": "localhost",
41-
"spp.ssl_enabled": False,
42-
"skywalking.collector.backend_service": "localhost:11800"
38+
"spp.ssl_enabled": False
4339
}).attach()
4440
```
4541

e2e/docker-compose.yml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ services:
1919
hostname: spp-platform
2020
ports:
2121
- "11800:11800"
22-
- "11801:11801" #todo: shouldn't be necessary
2322
- "12800:12800"
2423
environment:
2524
- SPP_LOGGING_LEVEL=trace

e2e/spp-probe.yml

-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ skywalking:
3737
level: "INFO"
3838
agent:
3939
service_name: "spp"
40-
collector:
41-
backend_service: "spp-platform:11801"
4240
plugin:
4341
toolkit:
4442
log:

0 commit comments

Comments
 (0)