simplify

Author: BFergerson

e2e/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - skywalking-oap
     environment:
       - SPP_PLATFORM_HOST=spp-platform
-      - SPP_SKYWALKING_HOST=skywalking-oap
+      - SPP_OAP_HOST=skywalking-oap
       - GRPC_DEFAULT_SSL_ROOTS_FILE_PATH=/usr/local/bin/config/spp-platform.crt
   spp-platform:
     container_name: spp-platform
@@ -24,20 +24,6 @@ services:
       - "5445:5445"
       - "5450:5450"
       - "5455:5455"
-    depends_on:
-      - redis
-    links:
-      - redis
-    environment:
-      - SPP_CLUSTER_URL=localhost
-      - SPP_CLUSTER_NAME=docker
-      - SPP_REDIS_HOST=redis
-      - SPP_SKYWALKING_HOST=skywalking-oap
-      - SPP_SYSTEM_ACCESS_TOKEN=change-me
-  redis:
-    image: redis:6.2.1
-    container_name: redis
-    hostname: redis
   skywalking-oap:
     container_name: skywalking-oap
     build:

sourceplusplus/SourcePlusPlus.py

@@ -64,8 +64,8 @@ def __init__(self, args: dict = None):
             "SPP_SERVICE_NAME", probe_config["skywalking"]["agent"].get("service_name"), "spp"
         )
 
-        skywalking_host = self.get_config_value("SPP_SKYWALKING_HOST", "localhost", "localhost")
-        skywalking_port = self.get_config_value("SPP_SKYWALKING_PORT", 11800, 11800)
+        skywalking_host = self.get_config_value("SPP_OAP_HOST", "localhost", "localhost")
+        skywalking_port = self.get_config_value("SPP_OAP_PORT", 11800, 11800)
         probe_config["skywalking"]["collector"]["backend_service"] = self.get_config_value(
             "SPP_SKYWALKING_BACKEND_SERVICE",
             probe_config["skywalking"]["collector"].get("backend_service"),