I have no expectation at all that this will actually work

apache · Feb 26, 2021 · 64235c5 · 64235c5
1 parent a882dce
commit 64235c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 30 deletions.
diff --git a/tests/plugins/pg/expected.data.yaml b/tests/plugins/pg/expected.data.yaml
@@ -33,12 +33,9 @@ segmentItems:
             peer: not null
             skipAnalysis: false
             tags:
-              - key: http.url
-                value: http://server:5000/postgres
-              - key: http.method
-                value: GET
-              - key: http.status.code
-                value: "200"
+              - { key: http.url, value: 'http://server:5000/postgres' }
+              - { key: http.method, value: GET }
+              - { key: http.status.code, value: '200' }
             refs:
               - parentEndpoint: ""
                 networkAddress: server:5000
@@ -55,17 +52,14 @@ segmentItems:
             spanLayer: Database
             startTime: gt 0
             endTime: gt 0
-            componentId: 5
+            componentId: 22
             spanType: Exit
-            peer: postgres:3306
+            peer: postgres:5432
             skipAnalysis: false
             tags:
-              - key: db.type
-                value: Mysql
-              - key: db.instance
-                value: test
-              - key: db.statement
-                value: SELECT * FROM `user` WHERE `name` = "u1"
+              - { key: db.type, value: PostgreSQL }
+              - { key: db.instance, value: test }
+              - { key: db.statement, value: SELECT * FROM "user" where name = 'u1' }
   - serviceName: client
     segmentSize: 1
     segments:
@@ -83,12 +77,9 @@ segmentItems:
             peer: not null
             skipAnalysis: false
             tags:
-              - key: http.url
-                value: http://localhost:5001/postgres
-              - key: http.method
-                value: GET
-              - key: http.status.code
-                value: "200"
+              - { key: http.url, value: 'http://localhost:5001/postgres' }
+              - { key: http.method, value: GET }
+              - { key: http.status.code, value: '200' }
           - operationName: /postgres
             operationId: 0
             parentSpanId: 0
@@ -101,11 +92,7 @@ segmentItems:
             peer: server:5000
             skipAnalysis: false
             tags:
-              - key: http.url
-                value: server:5000/postgres
-              - key: http.method
-                value: GET
-              - key: http.status.code
-                value: "200"
-              - key: http.status.msg
-                value: OK
+              - { key: http.url, value: 'server:5000/postgres' }
+              - { key: http.method, value: GET }
+              - { key: http.status.code, value: '200' }
+              - { key: http.status.msg, value: OK }
diff --git a/tests/plugins/pg/test.ts b/tests/plugins/pg/test.ts
@@ -31,7 +31,7 @@ describe('plugin tests', () => {
   beforeAll(async () => {
     compose = await new DockerComposeEnvironment(rootDir, 'docker-compose.yml')
       .withWaitStrategy('client', Wait.forHealthCheck())
-      .withWaitStrategy('postgre', Wait.forHealthCheck())
+      .withWaitStrategy('postgres', Wait.forHealthCheck())
       .up();
   });
 
@@ -40,7 +40,7 @@ describe('plugin tests', () => {
   });
 
   it(__filename, async () => {
-    await waitForExpect(async () => expect((await axios.get('http://localhost:5001/postgre')).status).toBe(200));
+    await waitForExpect(async () => expect((await axios.get('http://localhost:5001/postgres')).status).toBe(200));
 
     const expectedData = await fs.readFile(path.join(rootDir, 'expected.data.yaml'), 'utf8');