add e2e test for kafka transporter #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

wu-sheng merged 21 commits into apache:main from dmsolr:e2e/kafka

Oct 18, 2021

.github/workflows/e2e.yaml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -23,8 +23,16 @@ on:
  
    jobs:

      E2E:

        name: Basic function + gRPC transport(Java8)

        name: Basic function + ${{ matrix.case.name }} transport(Java8)

        runs-on: ubuntu-latest

        timeout-minutes: 90

        strategy:

          matrix:

            case:

              - name: gRPC

                path: test/e2e/case/grpc/e2e.yaml

              - name: Kafka

                path: test/e2e/case/kafka/e2e.yaml

        steps:

          - uses: actions/checkout@v2

            with:

    @@ -42,7 +50,11 @@ jobs:
  
              SW_VERSION=$(./mvnw -q -DforceStdout -N org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version)

              ./mvnw -B package -f ./test/e2e/base/pom.xml -Dsw.version=${SW_VERSION}

              echo "::endgroup::"

          - name: Setup go

            uses: actions/setup-go@v2

            with:

              go-version: '1.16'

          - name: Run E2E Tests

            uses: apache/skywalking-infra-e2e@7d55a252c35bf69f65dc64675a80699dc3c21bde

            uses: apache/skywalking-infra-e2e@main

            with:

              e2e-file: test/e2e/case/base/e2e.yaml

              e2e-file: ${{ matrix.case.path }}

apm-sniffer/config/agent.config

-Original file line number
+Diff line change
@@ Expand Up @@
     #  Specify which Kafka topic name for the register or heartbeat data of Service Instance to report to.
     plugin.kafka.topic_management=${SW_PLUGIN_KAFKA_TOPIC_MANAGEMENT:skywalking-managements}
     # Specify which Kafka topic name for the logging data to report to.
-    plugin.kafka.topic_logging=${SW_PLUGIN_KAFKA_TOPIC_LOGGING:skywalking-logging}
+    plugin.kafka.topic_logging=${SW_PLUGIN_KAFKA_TOPIC_LOGGING:skywalking-logs}
     #  isolate multi OAP server when using same Kafka cluster (final topic name will append namespace before Kafka topics with `-` ).
     plugin.kafka.namespace=${SW_KAFKA_NAMESPACE:}
     #   Match spring beans with regular expression for the class name. Multiple expressions could be separated by a comma. This only works when `Spring annotation plugin` has been activated.
@@ Expand Down @@

test/e2e/base/base-compose.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -35,14 +35,16 @@ services:
  
        build:

          context: provider

          dockerfile: Dockerfile

          args:

            ENABLE_KAFKA_REPORTER: "false"

        expose:

          - 9090

        networks:

          - e2e

        environment:

          SW_AGENT_NAME: e2e-service-provider

          SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap:11800

          SW_INSTANCE_NAME: provider1

          SW_AGENT_INSTANCE_NAME: provider1

          SW_LOGGING_OUTPUT: CONSOLE

        healthcheck:

          test: [ "CMD", "sh", "-c", "nc -zn 127.0.0.1 9090"]

    @@ -54,15 +56,16 @@ services:
  
        build:

          context: consumer

          dockerfile: Dockerfile

          args:

            ENABLE_KAFKA_REPORTER: "false"

        expose:

          - 9090

        networks:

          - e2e

        environment:

          PROVIDER_URL: http://provider:9090

          SW_AGENT_COLLECTOR_BACKEND_SERVICES: oap:11800

          SW_AGENT_NAME: e2e-service-consumer

          SW_INSTANCE_NAME: consumer1

          SW_AGENT_INSTANCE_NAME: consumer1

          SW_LOGGING_OUTPUT: CONSOLE

        healthcheck:

          test: [ "CMD", "sh", "-c", "nc -zn 127.0.0.1 9090"]

test/e2e/base/consumer/Dockerfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,10 @@ @@
     FROM skywalking/skywalking-java:latest-java8
+    ARG ENABLE_KAFKA_REPORTER
+    RUN if [[ "${ENABLE_KAFKA_REPORTER}" == "true" ]]; then cp -rf /skywalking/agent/optional-reporter-plugins/* /skywalking/agent/plugins/ ; fi
     VOLUME /services
     ADD target/e2e-service-consumer.jar /services/
@@ Expand Down @@

test/e2e/base/provider/Dockerfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,10 @@ @@
     FROM skywalking/skywalking-java:latest-java8
+    ARG ENABLE_KAFKA_REPORTER
+    RUN if [[ "${ENABLE_KAFKA_REPORTER}" == "true" ]]; then cp -rf /skywalking/agent/optional-reporter-plugins/* /skywalking/agent/plugins/ ; fi
     VOLUME /services
     ADD target/e2e-service-provider.jar /services/
@@ Expand Down @@

test/e2e/case/base/e2e.yaml

This file was deleted.

test/e2e/case/base/expected/traces-list.yml

This file was deleted.

test/e2e/case/base/expected/event-list.yml → test/e2e/case/expected/event-list.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     # limitations under the License.
     events:
-    {{- range .events }}
+    {{- contains .events }}
     - uuid: {{ notEmpty .uuid }}
       source:
         service: e2e-service-provider
@@ Expand All / @@ -24,12 +24,10 @@ events: @@
       type: Normal
       message: Start Java Application
       parameters:
-      {{- range .parameters }}
-      {{- if eq .key "OPTS"}}
+      {{- contains .parameters }}
         - key: OPTS
           value: {{ notEmpty .value }}
       {{- end }}
-      {{- end }}
       starttime: {{ gt .starttime 0 }}
       endtime: {{ gt .endtime 0 }}
     {{- end }}
@@ Expand Down @@

test/e2e/case/base/expected/logs-list.yml → test/e2e/case/expected/logs-list.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     # limitations under the License.
     logs:
-      {{- range .logs }}
+      {{- contains .logs }}
       - servicename: e2e-service-provider
         serviceid: {{ b64enc "e2e-service-provider" }}.1
         serviceinstancename: provider1
@@ Expand All / @@ -27,19 +27,13 @@ logs: @@
         content: |
           {{ notEmpty .content }}
         tags:
-        {{- range .tags }}
-        {{- if eq .key "level"}}
+        {{- contains .tags }}
         - key: level
           value: INFO
-        {{- end }}
-        {{- if eq .key "logger" }}
         - key: logger
           value: {{ notEmpty .value }}
-        {{- end }}
-        {{- if eq .key "thread" }}
         - key: thread
           value: {{ notEmpty .value }}
         {{- end }}
-        {{- end }}
-        {{- end }}
+      {{- end }}
     total: {{ gt .total 0 }}

0 .../case/base/expected/metrics-has-value.yml → test/e2e/case/expected/metrics-has-value.yml

File renamed without changes.

...e/case/base/expected/service-endpoint.yml → test/e2e/case/expected/service-endpoint.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,9 +13,7 @@ @@
     # See the License for the specific language governing permissions and
     # limitations under the License.
-    {{- range .}}
-    {{- if eq .name "POST:/info" }}
+    {{- contains .}}
     - id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "POST:/info" }}
       name: POST:/info
-    {{- end}}
     {{- end}}

...e/case/base/expected/service-instance.yml → test/e2e/case/expected/service-instance.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,40 +15,26 @@ @@
     # specific language governing permissions and limitations
     # under the License.
-    {{- range .}}
+    {{- contains .}}
     - id: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
       name: {{ notEmpty .name }}
       attributes:
-      {{- range .attributes }}
-      {{- if eq .name "OS Name" }}
+      {{- contains .attributes }}
       - name: OS Name
         value: Linux
-      {{- end }}
-      {{- if eq .name "hostname" }}
       - name: hostname
         value: {{ notEmpty .value }}
-      {{- end }}
-      {{- if eq .name "Process No." }}
       - name: Process No.
         value: "1"
-      {{- end }}
-      {{- if eq .name "Start Time" }}
       - name: Start Time
         value: {{ notEmpty .value }}
-      {{- end }}
-      {{- if eq .name "JVM Arguments" }}
       - name: JVM Arguments
         value: '{{ notEmpty .value }}'
-      {{- end }}
-      {{- if eq .name "Jar Dependencies" }}
       - name: Jar Dependencies
         value: '{{ notEmpty .value }}'
-      {{- end }}
-      {{- if eq .name "ipv4s" }}
       - name: ipv4s
         value: {{ notEmpty .value }}
-      {{- end }}
-      {{- end}}
+        {{- end }}
       language: JAVA
       instanceuuid: {{ b64enc "e2e-service-provider" }}.1_{{ b64enc "provider1" }}
     {{- end}}

0 test/e2e/case/base/expected/service.yml → test/e2e/case/expected/service.yml

File renamed without changes.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add e2e test for kafka transporter #42

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!