Unify the tag name with other agents (#208)
diff --git a/skywalking/trace/tags.py b/skywalking/trace/tags.py
index 76201d1..646ce74 100644
--- a/skywalking/trace/tags.py
+++ b/skywalking/trace/tags.py
@@ -31,11 +31,11 @@
class TagHttpStatusCode(Tag):
- key = 'http.status.code'
+ key = 'http.status_code'
class TagHttpStatusMsg(Tag):
- key = 'http.status.msg'
+ key = 'http.status_msg'
class TagHttpParams(Tag):
diff --git a/tests/e2e/case/expected/trace-artist-detail.yml b/tests/e2e/case/expected/trace-artist-detail.yml
index 79c6a15..30855fc 100644
--- a/tests/e2e/case/expected/trace-artist-detail.yml
+++ b/tests/e2e/case/expected/trace-artist-detail.yml
@@ -36,7 +36,7 @@
value: POST
- key: http.url
value: {{ notEmpty .value }}
- - key: http.status.code
+ - key: http.status_code
value: "200"
{{- end }}
logs: []
@@ -61,7 +61,7 @@
value: POST
- key: http.url
value: http://provider:9090/artist
- - key: http.status.code
+ - key: http.status_code
value: "200"
{{- end }}
logs: []
@@ -93,8 +93,8 @@
- key: http.url
# Change OAP side e2e from url -> http.url # why is oap e2e passing?? todo check with custom e2e build
value: http://provider:9090/artist
- - key: http.status.code
- # Change OAP side e2e from status.code -> http.status.code
+ - key: http.status_code
+ # Change OAP side e2e from status.code -> http.status_code
value: "200"
{{- end }}
logs: []
diff --git a/tests/plugin/data/sw_elasticsearch/expected.data.yml b/tests/plugin/data/sw_elasticsearch/expected.data.yml
index 0e1bfd8..2717ee6 100644
--- a/tests/plugin/data/sw_elasticsearch/expected.data.yml
+++ b/tests/plugin/data/sw_elasticsearch/expected.data.yml
@@ -78,7 +78,7 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
diff --git a/tests/plugin/data/sw_kafka/expected.data.yml b/tests/plugin/data/sw_kafka/expected.data.yml
index 837c390..44940e1 100644
--- a/tests/plugin/data/sw_kafka/expected.data.yml
+++ b/tests/plugin/data/sw_kafka/expected.data.yml
@@ -46,7 +46,7 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
diff --git a/tests/plugin/data/sw_mysqlclient/expected.data.yml b/tests/plugin/data/sw_mysqlclient/expected.data.yml
index cae7ce2..2f96292 100644
--- a/tests/plugin/data/sw_mysqlclient/expected.data.yml
+++ b/tests/plugin/data/sw_mysqlclient/expected.data.yml
@@ -50,7 +50,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -81,7 +81,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -99,11 +99,11 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
componentId: 7001
spanType: Entry
peer: not null
- skipAnalysis: false
\ No newline at end of file
+ skipAnalysis: false
diff --git a/tests/plugin/data/sw_psycopg/expected.data.yml b/tests/plugin/data/sw_psycopg/expected.data.yml
index 2544a3b..4d53883 100644
--- a/tests/plugin/data/sw_psycopg/expected.data.yml
+++ b/tests/plugin/data/sw_psycopg/expected.data.yml
@@ -50,7 +50,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -81,7 +81,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -99,7 +99,7 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -107,4 +107,4 @@
isError: false
spanType: Entry
peer: not null
- skipAnalysis: false
\ No newline at end of file
+ skipAnalysis: false
diff --git a/tests/plugin/data/sw_psycopg2/expected.data.yml b/tests/plugin/data/sw_psycopg2/expected.data.yml
index c5a91a1..fd802ff 100644
--- a/tests/plugin/data/sw_psycopg2/expected.data.yml
+++ b/tests/plugin/data/sw_psycopg2/expected.data.yml
@@ -51,7 +51,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -82,7 +82,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -101,7 +101,7 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -109,4 +109,4 @@
isError: false
spanType: Entry
peer: not null
- skipAnalysis: false
\ No newline at end of file
+ skipAnalysis: false
diff --git a/tests/plugin/data/sw_pymongo/expected.data.yml b/tests/plugin/data/sw_pymongo/expected.data.yml
index 6afd548..63ef551 100644
--- a/tests/plugin/data/sw_pymongo/expected.data.yml
+++ b/tests/plugin/data/sw_pymongo/expected.data.yml
@@ -54,7 +54,7 @@
value: GET
- key: http.url
value: http://provider:9091/insert_many
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /insert_many
@@ -100,7 +100,7 @@
value: GET
- key: http.url
value: http://provider:9091/find_one
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /find_one
@@ -146,7 +146,7 @@
value: GET
- key: http.url
value: http://provider:9091/delete_one
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /delete_one
@@ -177,7 +177,7 @@
value: GET
- key: http.url
value: http://provider:9091/insert_many
- - key: http.status.code
+ - key: http.status_code
value: '200'
- operationName: /find_one
parentSpanId: 0
@@ -194,7 +194,7 @@
value: GET
- key: http.url
value: http://provider:9091/find_one
- - key: http.status.code
+ - key: http.status_code
value: '200'
- operationName: /delete_one
parentSpanId: 0
@@ -211,7 +211,7 @@
value: GET
- key: http.url
value: http://provider:9091/delete_one
- - key: http.status.code
+ - key: http.status_code
value: '200'
- operationName: /users
operationId: 0
@@ -229,5 +229,5 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
diff --git a/tests/plugin/data/sw_pymysql/expected.data.yml b/tests/plugin/data/sw_pymysql/expected.data.yml
index 901f8eb..4f3ad66 100644
--- a/tests/plugin/data/sw_pymysql/expected.data.yml
+++ b/tests/plugin/data/sw_pymysql/expected.data.yml
@@ -50,7 +50,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -81,7 +81,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -99,11 +99,11 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
componentId: 7001
spanType: Entry
peer: not null
- skipAnalysis: false
\ No newline at end of file
+ skipAnalysis: false
diff --git a/tests/plugin/data/sw_rabbitmq/expected.data.yml b/tests/plugin/data/sw_rabbitmq/expected.data.yml
index e5e9a79..e12e1c8 100644
--- a/tests/plugin/data/sw_rabbitmq/expected.data.yml
+++ b/tests/plugin/data/sw_rabbitmq/expected.data.yml
@@ -48,7 +48,7 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
diff --git a/tests/plugin/data/sw_redis/expected.data.yml b/tests/plugin/data/sw_redis/expected.data.yml
index cbf57ad..d690200 100644
--- a/tests/plugin/data/sw_redis/expected.data.yml
+++ b/tests/plugin/data/sw_redis/expected.data.yml
@@ -65,7 +65,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -96,7 +96,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -114,11 +114,11 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
componentId: 7001
spanType: Entry
peer: not null
- skipAnalysis: false
\ No newline at end of file
+ skipAnalysis: false
diff --git a/tests/plugin/http/sw_aiohttp/expected.data.yml b/tests/plugin/http/sw_aiohttp/expected.data.yml
index 60e2e76..1cc0cab 100644
--- a/tests/plugin/http/sw_aiohttp/expected.data.yml
+++ b/tests/plugin/http/sw_aiohttp/expected.data.yml
@@ -30,7 +30,7 @@
value: GET
- key: http.url
value: http://provider:9091/skywalking
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /skywalking
@@ -61,7 +61,7 @@
value: GET
- key: http.url
value: http://provider:9091/skywalking
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -78,7 +78,7 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/skywalking
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -86,4 +86,3 @@
spanType: Entry
peer: not null
skipAnalysis: false
-
diff --git a/tests/plugin/http/sw_http/expected.data.yml b/tests/plugin/http/sw_http/expected.data.yml
index 16adce8..a111ef4 100644
--- a/tests/plugin/http/sw_http/expected.data.yml
+++ b/tests/plugin/http/sw_http/expected.data.yml
@@ -30,7 +30,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -61,7 +61,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -79,7 +79,7 @@
value: POST
- key: http.url
value: http://0.0.0.0:9090/
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -87,4 +87,3 @@
spanType: Entry
peer: not null
skipAnalysis: false
-
diff --git a/tests/plugin/http/sw_http_wsgi/expected.data.yml b/tests/plugin/http/sw_http_wsgi/expected.data.yml
index 9ccfec5..c169aa3 100644
--- a/tests/plugin/http/sw_http_wsgi/expected.data.yml
+++ b/tests/plugin/http/sw_http_wsgi/expected.data.yml
@@ -31,7 +31,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -62,7 +62,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -80,7 +80,7 @@
value: POST
- key: http.url
value: http://0.0.0.0:9090/
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -88,4 +88,3 @@
spanType: Entry
peer: not null
skipAnalysis: false
-
diff --git a/tests/plugin/http/sw_requests/expected.data.yml b/tests/plugin/http/sw_requests/expected.data.yml
index 5cee8ed..c9d2f1b 100644
--- a/tests/plugin/http/sw_requests/expected.data.yml
+++ b/tests/plugin/http/sw_requests/expected.data.yml
@@ -31,7 +31,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -62,7 +62,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -80,11 +80,11 @@
value: POST
- key: http.url
value: http://0.0.0.0:9090/
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
componentId: 7000
spanType: Entry
peer: not null
- skipAnalysis: false
\ No newline at end of file
+ skipAnalysis: false
diff --git a/tests/plugin/http/sw_urllib3/expected.data.yml b/tests/plugin/http/sw_urllib3/expected.data.yml
index d67762e..a46cc06 100644
--- a/tests/plugin/http/sw_urllib3/expected.data.yml
+++ b/tests/plugin/http/sw_urllib3/expected.data.yml
@@ -32,7 +32,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -70,7 +70,7 @@
value: POST
- key: http.url
value: 'http://provider:9091/users'
- - key: http.status.code
+ - key: http.status_code
value: '200'
- operationName: /users
operationId: 0
@@ -89,5 +89,5 @@
value: GET
- key: http.url
value: 'http://0.0.0.0:9090/users'
- - key: http.status.code
- value: '200'
\ No newline at end of file
+ - key: http.status_code
+ value: '200'
diff --git a/tests/plugin/web/sw_django/expected.data.yml b/tests/plugin/web/sw_django/expected.data.yml
index 9222ce0..09037fc 100644
--- a/tests/plugin/web/sw_django/expected.data.yml
+++ b/tests/plugin/web/sw_django/expected.data.yml
@@ -36,7 +36,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -67,7 +67,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
- operationName: /users
parentSpanId: -1
@@ -86,5 +86,5 @@
value: http://0.0.0.0:9090/users
- key: http.params
value: "test=[test1,test2]\ntest2=[test2]"
- - key: http.status.code
+ - key: http.status_code
value: '200'
diff --git a/tests/plugin/web/sw_falcon/expected.data.yml b/tests/plugin/web/sw_falcon/expected.data.yml
index 23f7440..8f63ecf 100644
--- a/tests/plugin/web/sw_falcon/expected.data.yml
+++ b/tests/plugin/web/sw_falcon/expected.data.yml
@@ -35,9 +35,9 @@
value: GET
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
- - key: http.status.msg
+ - key: http.status_msg
value: OK
serviceName: provider
- segmentSize: 1
@@ -60,7 +60,7 @@
value: GET
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
- componentId: 7012
endTime: gt 0
@@ -78,8 +78,8 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
- - key: http.status.msg
+ - key: http.status_msg
value: OK
- serviceName: consumer
\ No newline at end of file
+ serviceName: consumer
diff --git a/tests/plugin/web/sw_fastapi/expected.data.yml b/tests/plugin/web/sw_fastapi/expected.data.yml
index e21baec..2c546af 100644
--- a/tests/plugin/web/sw_fastapi/expected.data.yml
+++ b/tests/plugin/web/sw_fastapi/expected.data.yml
@@ -36,7 +36,7 @@
value: GET
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -67,7 +67,7 @@
value: GET
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
- operationName: /users
parentSpanId: -1
@@ -86,5 +86,5 @@
value: http://0.0.0.0:9090/users
- key: http.params
value: "test=[test1,test2]\ntest2=[test2]"
- - key: http.status.code
+ - key: http.status_code
value: '200'
diff --git a/tests/plugin/web/sw_flask/expected.data.yml b/tests/plugin/web/sw_flask/expected.data.yml
index 6d4dcf9..8382edd 100644
--- a/tests/plugin/web/sw_flask/expected.data.yml
+++ b/tests/plugin/web/sw_flask/expected.data.yml
@@ -30,7 +30,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -58,7 +58,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -96,7 +96,7 @@
value: POST
- key: http.url
value: 'http://provider:9091/users'
- - key: http.status.code
+ - key: http.status_code
value: '200'
- operationName: /test
operationId: 0
@@ -130,7 +130,7 @@
value: POST
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -150,7 +150,7 @@
value: http://0.0.0.0:9090/users
- key: http.params
value: "test=[test1,test2]\ntest2=[test2]"
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
diff --git a/tests/plugin/web/sw_pyramid/expected.data.yml b/tests/plugin/web/sw_pyramid/expected.data.yml
index b68b0ed..bda0147 100644
--- a/tests/plugin/web/sw_pyramid/expected.data.yml
+++ b/tests/plugin/web/sw_pyramid/expected.data.yml
@@ -31,7 +31,7 @@
value: POST
- key: http.url
value: http://provider:9091/pyramid
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /pyramid
@@ -62,7 +62,7 @@
value: POST
- key: http.url
value: http://provider:9091/pyramid
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -80,7 +80,7 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/pyramid
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -88,4 +88,3 @@
spanType: Entry
peer: not null
skipAnalysis: false
-
diff --git a/tests/plugin/web/sw_sanic/expected.data.yml b/tests/plugin/web/sw_sanic/expected.data.yml
index 3c4ca4c..f838450 100644
--- a/tests/plugin/web/sw_sanic/expected.data.yml
+++ b/tests/plugin/web/sw_sanic/expected.data.yml
@@ -31,7 +31,7 @@
value: GET
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -62,7 +62,7 @@
value: GET
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -82,11 +82,11 @@
value: http://0.0.0.0:9090/users
- key: http.params
value: "test=[test1,test2]\ntest2=[test2]"
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
componentId: 7007
spanType: Entry
peer: not null
- skipAnalysis: false
\ No newline at end of file
+ skipAnalysis: false
diff --git a/tests/plugin/web/sw_tornado/expected.data.yml b/tests/plugin/web/sw_tornado/expected.data.yml
index c2bb860..eea6031 100644
--- a/tests/plugin/web/sw_tornado/expected.data.yml
+++ b/tests/plugin/web/sw_tornado/expected.data.yml
@@ -31,7 +31,7 @@
value: GET
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
refs:
- parentEndpoint: /users
@@ -62,7 +62,7 @@
value: GET
- key: http.url
value: http://provider:9091/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
@@ -80,11 +80,11 @@
value: GET
- key: http.url
value: http://0.0.0.0:9090/users
- - key: http.status.code
+ - key: http.status_code
value: '200'
startTime: gt 0
endTime: gt 0
componentId: 7005
spanType: Entry
peer: not null
- skipAnalysis: false
\ No newline at end of file
+ skipAnalysis: false
