fix failing lambda tets and aws-sdk tests

Author: mtoffl01

packages/datadog-plugin-aws-sdk/test/aws-sdk.spec.js

@@ -396,6 +396,8 @@ describe('Plugin', () => {
           process.env.DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED = true
           process.env.DD_TRACE_AWS_SDK_KINESIS_BATCH_PROPAGATION_ENABLED = false
           process.env.DD_TRACE_AWS_SDK_SQS_BATCH_PROPAGATION_ENABLED = true
+          const { resetConfigEnvSources } = require('../../dd-trace/src/config-env-sources')
+          resetConfigEnvSources()
 
           return agent.load(['aws-sdk'])
         })

packages/dd-trace/test/lambda/index.spec.js

@@ -211,6 +211,9 @@ describe('lambda', () => {
       // Set the desired handler to patch
       process.env.DD_TRACE_DISABLED_INSTRUMENTATIONS = 'lambda'
       process.env.DD_LAMBDA_HANDLER = 'handler.handler'
+      // Reset ConfigEnvSources so lambda module picks up the env vars
+      const { resetConfigEnvSources } = require('../../src/config-env-sources')
+      resetConfigEnvSources()
       // Register hook for patching
       await loadAgent()
 
@@ -274,6 +277,9 @@ describe('lambda', () => {
       it(`traces error on impending timeout using ${flushDeadlineEnvVar} ${customDeadline} deadline`, () => {
         process.env[flushDeadlineEnvVar] = customDeadline
         process.env.DD_LAMBDA_HANDLER = 'handler.timeoutHandler'
+        // Reset ConfigEnvSources so lambda handler picks up the env vars
+        const { resetConfigEnvSources } = require('../../src/config-env-sources')
+        resetConfigEnvSources()
 
         const _context = {
           getRemainingTimeInMillis: () => 25