enable e2e test

Signed-off-by: tison <[email protected]>

Author: tisonkun

.github/workflows/test.yaml renamed to .github/workflows/codecov.yaml

@@ -1,4 +1,4 @@
-name: test
+name: codecov
 on:
   pull_request:
   push:

.github/workflows/e2e.yml

@@ -0,0 +1,25 @@
+name: agent-test-tool
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+      - 'v*'
+
+jobs:
+  e2e-rust:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Prepare service container
+        run: docker-compose -f docker-compose.e2e.yml up --build -d
+      - name: Run e2e
+        run: |
+          pip3 install --upgrade pip
+          pip3 install setuptools
+          pip3 install -r requirements.txt
+          python3 tests/e2e/run_e2e.py --expected_file=tests/e2e/data/expected_context.yaml --max_retry_times=3 --target_path=/ping

docker-compose.e2e.yml

@@ -1,20 +1,18 @@
 version: "3.7"
 services:
   collector:
-    build:
-      context: .
-      dockerfile: ./tests/e2e/docker/Dockerfile.tool
+    image: ghcr.io/apache/skywalking-agent-test-tool/mock-collector:5acb890f225ca37ee60675ce3e330545e23e3cbc
     ports:
-      - 19876:19876
-      - 12800:12800
+      - "19876:19876"
+      - "12800:12800"
 
   consumer:
     build:
       context: .
       dockerfile: ./tests/e2e/docker/Dockerfile
     expose: 
       - 8082
-    command: cargo run -- --mode consumer
+    command: --mode consumer
     depends_on:
       - collector
 
@@ -23,8 +21,8 @@ services:
       context: .
       dockerfile: ./tests/e2e/docker/Dockerfile
     ports:
-      - 8081:8081
-    command: cargo run -- --mode producer
+      - "8081:8081"
+    command: --mode producer
     depends_on:
       - collector
       - consumer

src/reporter/grpc.rs

@@ -58,6 +58,7 @@ impl Reporter {
     ///     let mut context = TracingContext::default("service", "instance");
     ///     reporter.sender().send(context).await?;
     ///     reporter.shutdown().await?;
+    ///     Ok(())
     /// }
     /// ```
     pub async fn start(address: impl Into<String>) -> Self {

tests/e2e/Cargo.lock

@@ -2,12 +2,10 @@
 name = "e2e"
 version = "0.1.0"
 authors = ["Shikugawa <[email protected]>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+edition = "2021"
 
 [dependencies]
-skywalking_rust = { path = "../../" }
+skywalking_rust = { path = "../.." }
 hyper = { version = "0.14", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 structopt = "0.3"

tests/e2e/Cargo.toml

@@ -1,5 +1,8 @@
-FROM rust:1.50.0
-RUN apt update && apt install -y protobuf-compiler
-RUN rustup component add rustfmt
-COPY . /tmp
-WORKDIR tmp/tests/e2e
+FROM rust:1.57 as build
+WORKDIR /build
+COPY . /build/
+RUN cd tests/e2e && cargo build --release --locked
+
+FROM gcr.io/distroless/cc
+COPY --from=build /build/tests/e2e/target/release/e2e /bin/
+ENTRYPOINT ["/bin/e2e"]

tests/e2e/docker/Dockerfile

@@ -7,6 +7,7 @@ use skywalking_rust::context::propagation::encoder::encode_propagation;
 use skywalking_rust::context::trace_context::TracingContext;
 use skywalking_rust::reporter::grpc::Reporter;
 use std::convert::Infallible;
+use std::error::Error;
 use std::net::SocketAddr;
 use structopt::StructOpt;
 use tokio::sync::mpsc;
@@ -66,7 +67,7 @@ async fn run_producer_service(host: [u8; 4], tx: mpsc::Sender<TracingContext>) {
     });
     let addr = SocketAddr::from((host, 8081));
     let server = Server::bind(&addr).serve(make_svc);
-
+    println!("starting producer on {:?}...", &addr);
     if let Err(e) = server.await {
         eprintln!("server error: {}", e);
     }
@@ -110,6 +111,7 @@ async fn run_consumer_service(host: [u8; 4], tx: mpsc::Sender<TracingContext>) {
     let addr = SocketAddr::from((host, 8082));
     let server = Server::bind(&addr).serve(make_svc);
 
+    println!("starting consumer on {:?}...", &addr);
     if let Err(e) = server.await {
         eprintln!("server error: {}", e);
     }
@@ -123,7 +125,7 @@ struct Opt {
 }
 
 #[tokio::main]
-async fn main() {
+async fn main() -> Result<(), Box<dyn Error>> {
     let opt = Opt::from_args();
     let reporter = Reporter::start("http://collector:19876").await;
     let tx = reporter.sender();
@@ -134,5 +136,6 @@ async fn main() {
         run_producer_service([0, 0, 0, 0], tx).await;
     }
 
-    reporter.shutdown().await.unwarp();
+    reporter.shutdown().await?;
+    Ok(())
 }