Try to simplify tests

DataDog · Nov 22, 2024 · 9caba79 · 9caba79
1 parent 0ab6403
commit 9caba79
Showing 1 changed file with 29 additions and 49 deletions.
diff --git a/packages/datadog-plugin-aws-sdk/test/dynamodb.spec.js b/packages/datadog-plugin-aws-sdk/test/dynamodb.spec.js
@@ -133,58 +133,39 @@ describe('Plugin', () => {
 
           function testSpanPointers ({ expectedLength = 1, expectedHashes, operation }) {
             return (done) => {
-              try {
-                let hasCompleted = false
-                operation((err) => {
-                  if (err) {
-                    console.log('[testSpanPointers] Error while completing operation:', err)
-                    if (!hasCompleted) {
-                      hasCompleted = true
-                      return done(err)
-                    }
-                  }
+              operation((err) => {
+                if (err) {
+                  return done(err)
+                }
 
-                  agent.use(traces => {
-                    if (hasCompleted) return
-                    try {
-                      const span = traces[0][0]
-                      const links = JSON.parse(span.meta?.['_dd.span_links'] || '[]')
-                      expect(links).to.have.lengthOf(expectedLength)
-
-                      if (expectedHashes) {
-                        if (Array.isArray(expectedHashes)) {
-                          expectedHashes.forEach((hash, i) => {
-                            expect(links[i].attributes['ptr.hash']).to.equal(hash)
-                          })
-                        } else {
-                          expect(links[0].attributes).to.deep.equal({
-                            'ptr.kind': DYNAMODB_PTR_KIND,
-                            'ptr.dir': SPAN_POINTER_DIRECTION.DOWNSTREAM,
-                            'ptr.hash': expectedHashes,
-                            'link.kind': 'span-pointer'
-                          })
-                        }
-                      }
-                      hasCompleted = true
-                      return done()
-                    } catch (error) {
-                      console.log('[testSpanPointers] Test error:', error)
-                      if (!hasCompleted) {
-                        hasCompleted = true
-                        return done(error)
+                agent.use(traces => {
+                  try {
+                    const span = traces[0][0]
+                    const links = JSON.parse(span.meta?.['_dd.span_links'] || '[]')
+                    expect(links).to.have.lengthOf(expectedLength)
+
+                    if (expectedHashes) {
+                      if (Array.isArray(expectedHashes)) {
+                        expectedHashes.forEach((hash, i) => {
+                          expect(links[i].attributes['ptr.hash']).to.equal(hash)
+                        })
+                      } else {
+                        expect(links[0].attributes).to.deep.equal({
+                          'ptr.kind': DYNAMODB_PTR_KIND,
+                          'ptr.dir': SPAN_POINTER_DIRECTION.DOWNSTREAM,
+                          'ptr.hash': expectedHashes,
+                          'link.kind': 'span-pointer'
+                        })
                       }
                     }
-                  }).catch(error => {
-                    console.log('[testSpanPointers] Caught error during agent.use:', error)
-                    if (!hasCompleted) {
-                      hasCompleted = true
-                      done(error)
-                    }
-                  })
+                    return done()
+                  } catch (error) {
+                    return done(error)
+                  }
+                }).catch(error => {
+                  done(error)
                 })
-              } catch (error) {
-                console.log('[testSpanPointers] Caught error:', error)
-              }
+              })
             }
           }
 
@@ -412,7 +393,6 @@ describe('Plugin', () => {
                 }
               }, async function (err) {
                 if (err) {
-                  console.log('MYERR:', err)
                   return done(err)
                 }
                 await new Promise(resolve => setTimeout(resolve, 100))