Fix wrong example in doc, sync Python E2E version and adjust E2E (#8751)

* Fix wrong example in doc, sync Python E2E version and adjust E2E

docs/en/protocols/HTTP-API-Protocol.md

@@ -17,9 +17,9 @@ Input:
 {
 	"service": "User Service Name",
 	"serviceInstance": "User Service Instance Name",
-	"properties": [{
-		"language": "Lua"
-	}]
+	"properties": [
+		{ "key": "language", "value": "Lua" }
+	]
 }
 ```
 
@@ -97,7 +97,7 @@ Input:
 }
 ```
  OutPut:
- 
+
  ```json
 
 ```
@@ -180,7 +180,7 @@ Input:
 }]
 ```
  OutPut:
- 
+
  ```json
 
 ```

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/enumeration/Language.java

@@ -22,7 +22,7 @@ public enum Language {
     UNKNOWN, JAVA, DOTNET, NODEJS, PYTHON, RUBY, GO, LUA, PHP;
 
     public static Language value(String language) {
-        switch (language) {
+        switch (language.toLowerCase()) {
             case "java":
                 return Language.JAVA;
             case ".net":

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/K8SServiceRegistry.java

@@ -64,9 +64,9 @@ public class K8SServiceRegistry {
 
     protected final ServiceNameFormatter serviceNameFormatter;
 
-    private final EnvoyMetricReceiverConfig config;
+    protected final KubernetesNodeRegistry nodeRegistry;
 
-    private final KubernetesNodeRegistry nodeRegistry;
+    private final EnvoyMetricReceiverConfig config;
 
     public K8SServiceRegistry(final EnvoyMetricReceiverConfig config) {
         this.config = config;

oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/als/k8s/KubernetesNodeRegistry.java

@@ -42,7 +42,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.skywalking.oap.server.library.util.StringUtil;
 
 @Slf4j
-final class KubernetesNodeRegistry implements ResourceEventHandler<V1Node> {
+public final class KubernetesNodeRegistry implements ResourceEventHandler<V1Node> {
     private final Set<String> nodeIPs;
 
     private final ExecutorService executor;

pom.xml

@@ -34,6 +34,7 @@
     <modules>
         <module>apm-protocol</module>
     </modules>
+
     <packaging>pom</packaging>
 
     <name>apm</name>

test/e2e-v2/cases/nodejs/expected/service-instance-consumer-nodejs.yml

@@ -27,7 +27,7 @@
   - name: ipv4s
     value: ""
   {{- end}}
-  language: UNKNOWN
+  language: NODEJS
   instanceuuid: {{ b64enc "consumer" }}.1_{{ b64enc "consumer-instance" }}
   layer: GENERAL
 {{- end}}

test/e2e-v2/cases/nodejs/expected/service-instance-provider-nodejs.yml

@@ -27,7 +27,7 @@
   - name: ipv4s
     value: ""
   {{- end}}
-  language: UNKNOWN
+  language: NODEJS
   instanceuuid: {{ b64enc "provider" }}.1_{{ b64enc "provider-instance" }}
   layer: GENERAL
 {{- end}}

test/e2e-v2/cases/python/Dockerfile.python

@@ -23,7 +23,7 @@ RUN git clone https://github.com/apache/skywalking-python.git $(pwd)
 RUN git reset --hard ${SW_AGENT_PYTHON_COMMIT} && git submodule update --init
 
 RUN make setup install
-RUN python3 -m pip install kafka-python
+RUN python3 -m pip install kafka-python requests
 
 ADD ./consumer.py /consumer.py
 ADD ./provider.py /provider.py

test/e2e-v2/cases/python/consumer.py

@@ -24,7 +24,7 @@ if __name__ == '__main__':
     config.service_name = 'consumer-py'
     config.logging_level = 'DEBUG'
     config.protocol = 'http'
-    config.collector_address = 'http://oap:12800'
+    config.collector_address = 'oap:12800'
     agent.start()
 
     import socketserver

test/e2e-v2/cases/python/expected/service-instance-consumer-py.yml

@@ -23,7 +23,7 @@
   - name: ipv4s
     value: ""
   {{- end}}
-  language: UNKNOWN
+  language: PYTHON
   instanceuuid: {{ b64enc "consumer-py" }}.1_{{ b64enc "consumer-py-instance" }}
   layer: GENERAL
 {{- end}}

test/e2e-v2/cases/python/expected/service-instance-provider-py-kafka.yml

@@ -23,7 +23,7 @@
   - name: ipv4s
     value: ""
   {{- end}}
-  language: UNKNOWN
+  language: PYTHON
   instanceuuid: {{ b64enc "provider-py-kafka" }}.1_{{ b64enc "provider-py-kafka-instance" }}
   layer: GENERAL
 {{- end}}

test/e2e-v2/cases/python/expected/service-instance-provider-py.yml

@@ -23,7 +23,7 @@
   - name: ipv4s
     value: ""
   {{- end}}
-  language: UNKNOWN
+  language: PYTHON
   instanceuuid: {{ b64enc "provider-py" }}.1_{{ b64enc "provider-py-instance" }}
   layer: GENERAL
 {{- end}}

test/e2e-v2/cases/python/expected/trace-test-detail.yml

@@ -55,9 +55,9 @@ spans:
       {{- contains .tags }}
       - key: http.method
         value: POST
-      - key: url
+      - key: http.url
         value: http://medium-java:9092/users
-      - key: status.code
+      - key: http.status.code
         value: "200"
       {{- end }}
     logs: []
@@ -159,9 +159,9 @@ spans:
       {{- contains .tags }}
       - key: http.method
         value: POST
-      - key: url
+      - key: http.url
         value: http://provider-py-kafka:9089/users
-      - key: status.code
+      - key: http.status.code
         value: "200"
       {{- end }}
     logs: []

test/e2e-v2/script/env

@@ -18,7 +18,7 @@ SW_AGENT_SATELLITE_COMMIT=1987e1d566ac90f6b58a45fd9bfa27bf8faad635
 SW_AGENT_NGINX_LUA_COMMIT=c3cee4841798a147d83b96a10914d4ac0e11d0aa
 SW_AGENT_NODEJS_COMMIT=2e7560518aff846befd4d6bc815fe5e38c704a11
 SW_AGENT_GO_COMMIT=4af380c2db6243106b0fc650b6003ce3b3eb82a0
-SW_AGENT_PYTHON_COMMIT=50388c55428d742d73d9733278f04173585de80d
+SW_AGENT_PYTHON_COMMIT=c76a6ec51a478ac91abb20ec8f22a99b8d4d6a58
 SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
 SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
 SW_KUBERNETES_COMMIT_SHA=0f3ec68e5a7e1608cec8688716b848ed15e971e5