Feature/modify components (#19)

* Modify component Id * Change components
SkyAPMTest · May 27, 2018 · 2b7ba4f · 2b7ba4f
1 parent dab4853
commit 2b7ba4f
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 46 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ testcases/
 .runtime/
 .idea/
 dependency-reduced-pom.xml
+.projectile
diff --git a/h2-struts2.3-scenario/config/expectedData.yaml b/h2-struts2.3-scenario/config/expectedData.yaml
@@ -27,7 +27,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 4
+          componentId: 32
           peer: localhost:-1
           peerId: eq 0
         -
@@ -46,7 +46,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 4
+          componentId: 32
           peer: localhost:-1
           peerId: eq 0
         -
@@ -65,7 +65,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 4
+          componentId: 32
           peer: localhost:-1
           peerId: eq 0
         -
@@ -84,7 +84,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 4
+          componentId: 32
           peer: localhost:-1
           peerId: eq 0
         - operationName: /struts2-h2-scenario/h2-struts2/case.action

diff --git a/h2-struts2.5-scenario/config/expectedData.yaml b/h2-struts2.5-scenario/config/expectedData.yaml
@@ -27,7 +27,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 4
+          componentId: 32
           peer: localhost:-1
           peerId: eq 0
         -
@@ -46,7 +46,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 4
+          componentId: 32
           peer: localhost:-1
           peerId: eq 0
         -
@@ -65,7 +65,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 4
+          componentId: 32
           peer: localhost:-1
           peerId: eq 0
         -
@@ -84,7 +84,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 4
+          componentId: 32
           peer: localhost:-1
           peerId: eq 0
         - operationName: /struts2-h2-scenario/h2-struts2/case.action

diff --git a/jedis-below-2.4-scenario/config/expectedData.yaml b/jedis-below-2.4-scenario/config/expectedData.yaml
@@ -26,7 +26,7 @@ segmentItems:
           spanLayer: Cache
           spanType: Exit
           componentName: null
-          componentId: 7
+          componentId: 30
           peer: redis-server:6379
           peerId: eq 0
         -
@@ -44,7 +44,7 @@ segmentItems:
           spanLayer: Cache
           spanType: Exit
           componentName: null
-          componentId: 7
+          componentId: 30
           peer: redis-server:6379
           peerId: eq 0
         -
@@ -62,7 +62,7 @@ segmentItems:
           spanLayer: Cache
           spanType: Exit
           componentName: null
-          componentId: 7
+          componentId: 30
           peer: redis-server:6379
           peerId: eq 0
         -

diff --git a/jedis-scenario/config/expectedData.yaml b/jedis-scenario/config/expectedData.yaml
@@ -26,7 +26,7 @@ segmentItems:
           spanLayer: Cache
           spanType: Exit
           componentName: null
-          componentId: 7
+          componentId: 30
           peer: redis-server:6379
           peerId: eq 0
         -
@@ -44,7 +44,7 @@ segmentItems:
           spanLayer: Cache
           spanType: Exit
           componentName: null
-          componentId: 7
+          componentId: 30
           peer: redis-server:6379
           peerId: eq 0
         -
@@ -62,7 +62,7 @@ segmentItems:
           spanLayer: Cache
           spanType: Exit
           componentName: null
-          componentId: 7
+          componentId: 30
           peer: redis-server:6379
           peerId: eq 0
         -

diff --git a/kafka-scenario/config/expectedData.yaml b/kafka-scenario/config/expectedData.yaml
@@ -18,7 +18,7 @@ segmentItems:
       spanLayer: MQ
       startTime: nq 0
       endTime: nq 0
-      componentId: 27
+      componentId: 40
       componentName: ''
       isError: false
       spanType: Exit
@@ -69,7 +69,7 @@ segmentItems:
       spanLayer: MQ
       startTime: nq 0
       endTime: nq 0
-      componentId: 27
+      componentId: 41
       componentName: ''
       isError: false
       spanType: Entry

diff --git a/mongodb-3.x-scenario/config/expectedData.yaml b/mongodb-3.x-scenario/config/expectedData.yaml
@@ -19,7 +19,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 9
+      componentId: 42
       componentName: ''
       isError: false
       spanType: Exit
@@ -34,7 +34,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 9
+      componentId: 42
       componentName: ''
       isError: false
       spanType: Exit
@@ -49,7 +49,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 9
+      componentId: 42
       componentName: ''
       isError: false
       spanType: Exit
@@ -64,7 +64,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 9
+      componentId: 42
       componentName: ''
       isError: false
       spanType: Exit
@@ -79,7 +79,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 9
+      componentId: 42
       componentName: ''
       isError: false
       spanType: Exit
@@ -94,7 +94,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 9
+      componentId: 42
       componentName: ''
       isError: false
       spanType: Exit
@@ -109,7 +109,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 9
+      componentId: 42
       componentName: ''
       isError: false
       spanType: Exit

diff --git a/mysql-scenario/config/expectedData.yaml b/mysql-scenario/config/expectedData.yaml
@@ -27,7 +27,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 5
+          componentId: 33
           peer: mysql-server:3306
           peerId: eq 0
         -
@@ -46,7 +46,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 5
+          componentId: 33
           peer: mysql-server:3306
           peerId: eq 0
         -
@@ -65,7 +65,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 5
+          componentId: 33
           peer: mysql-server:3306
           peerId: eq 0
         -
@@ -84,7 +84,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 5
+          componentId: 33
           peer: mysql-server:3306
           peerId: eq 0
         -

diff --git a/oracle-scenario/config/expectedData.yaml b/oracle-scenario/config/expectedData.yaml
@@ -19,7 +19,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 6
+      componentId: 34
       componentName: ''
       isError: false
       spanType: Exit
@@ -38,7 +38,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 6
+      componentId: 34
       componentName: ''
       isError: false
       spanType: Exit
@@ -55,7 +55,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 6
+      componentId: 34
       componentName: ''
       isError: false
       spanType: Exit
@@ -72,7 +72,7 @@ segmentItems:
       spanLayer: Database
       startTime: nq 0
       endTime: nq 0
-      componentId: 6
+      componentId: 34
       componentName: ''
       isError: false
       spanType: Exit
@@ -93,7 +93,7 @@ segmentItems:
       - {key: db.statement,value: ''}
       startTime: nq 0
       endTime: nq 0
-      componentId: 6
+      componentId: 34
       componentName: ''
       isError: false
       spanType: Exit

diff --git a/postgresql-9.4-scenario/config/expectedData.yaml b/postgresql-9.4-scenario/config/expectedData.yaml
@@ -27,7 +27,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -
@@ -46,7 +46,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -
@@ -65,7 +65,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -
@@ -84,7 +84,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -
@@ -103,7 +103,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -

diff --git a/postgresql-scenario/config/expectedData.yaml b/postgresql-scenario/config/expectedData.yaml
@@ -27,7 +27,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -
@@ -46,7 +46,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -
@@ -65,7 +65,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -
@@ -84,7 +84,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -
@@ -103,7 +103,7 @@ segmentItems:
           spanLayer: Database
           spanType: Exit
           componentName: null
-          componentId: 22
+          componentId: 37
           peer: postgresql-server:5432
           peerId: eq 0
         -