kezhenxu94 commented on a change in pull request #6248:
URL: https://github.com/apache/skywalking/pull/6248#discussion_r564951367
##########
File path: test/e2e/e2e-test/docker/kafka/docker-compose.log.yml
##########
@@ -31,33 +31,34 @@ services:
condition: service_healthy
broker-b:
condition: service_healthy
- provider_kafka:
+
+ sw-satellite:
build:
context: ../../../
- dockerfile: e2e-test/docker/kafka/Dockerfile.log.producer
- args:
- - SW_AGENT_JDK_VERSION=${SW_AGENT_JDK_VERSION}
+ dockerfile: e2e-test/docker/Dockerfile.satellite
networks:
- e2e
expose:
- - 8080
+ - 11800
volumes:
- - ../../../../jacoco:/jacoco
- environment:
- JAVA_OPTS: >-
-
-javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/provider,destfile=/jacoco/provider.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.*
- -Dbootstrap.service=broker-a:9092,broker-b:9092
- healthcheck:
- test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 8080"]
- interval: 5s
- timeout: 60s
- retries: 120
+ - ./satellite_config.yaml:/configs/satellite_config.yaml
+ command: ["start"]
Review comment:
Forget to modify this? Should be `/sw-satellite` or remove this line?
##########
File path: test/e2e/e2e-test/docker/kafka/docker-compose.log.yml
##########
@@ -31,33 +31,34 @@ services:
condition: service_healthy
broker-b:
condition: service_healthy
- provider_kafka:
+
+ sw-satellite:
build:
context: ../../../
- dockerfile: e2e-test/docker/kafka/Dockerfile.log.producer
- args:
- - SW_AGENT_JDK_VERSION=${SW_AGENT_JDK_VERSION}
+ dockerfile: e2e-test/docker/Dockerfile.satellite
networks:
- e2e
expose:
- - 8080
+ - 11800
volumes:
- - ../../../../jacoco:/jacoco
- environment:
- JAVA_OPTS: >-
-
-javaagent:/jacoco/jacocoagent.jar=classdumpdir=/jacoco/classes/provider,destfile=/jacoco/provider.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.*
- -Dbootstrap.service=broker-a:9092,broker-b:9092
- healthcheck:
- test: ["CMD", "sh", "-c", "nc -nz 127.0.0.1 8080"]
- interval: 5s
- timeout: 60s
- retries: 120
+ - ./satellite_config.yaml:/configs/satellite_config.yaml
+ command: ["start"]
depends_on:
oap:
condition: service_healthy
broker-a:
condition: service_healthy
broker-b:
condition: service_healthy
+
+ provider:
+ extends:
+ file: ../base-compose.yml
+ service: provider
+ environment:
+ SW_GRPC_LOG_SERVER_HOST: sw-satellite
+ depends_on:
+ oap:
+ condition: service_healthy
Review comment:
Better also add `sw-satellite` here
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
