SYSOPS-15175: Updating from master branch of DataDog/datadog-serverless-functions

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,36 @@
+<!--- Please remember to review the [contribution guidelines](https://github.com/DataDog/datadog-serverless-functions/blob/master/CONTRIBUTING.md) if you have not yet done so._  --->
+
 ### What does this PR do?
 
-A brief description of the change being made with this pull request.
+<!--- A brief description of the change being made with this pull request. --->
 
 ### Motivation
 
-What inspired you to submit this pull request?
+<!--- What inspired you to submit this pull request? --->
+
+### Testing Guidelines
+
+<!--- How did you test this pull request? --->
 
 ### Additional Notes
 
-Anything else we should know when reviewing?
+<!--- Anything else we should know when reviewing? --->
+
+### Types of changes
+
+- [ ] Bug fix
+- [ ] New feature
+- [ ] Breaking change
+- [ ] Misc (docs, refactoring, dependency upgrade, etc.)
+
+### Check all that apply
+
+- [ ] This PR's description is comprehensive
+- [ ] This PR contains breaking changes that are documented in the description
+- [ ] This PR introduces new APIs or parameters that are documented and unlikely to change in the foreseeable future
+- [ ] This PR impacts documentation, and it has been updated (or a ticket has been logged)
+- [ ] This PR's changes are covered by the automated tests
+- [ ] This PR collects user input/sensitive content into Datadog
+- [ ] This PR passes the integration tests (ask a Datadog member to run the tests)
+- [ ] This PR passes the unit tests 
+- [ ] This PR passes the installation tests (ask a Datadog member to run the tests)

.github/workflows/integration_test.yml

@@ -0,0 +1,17 @@
+name: Integration tests
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ["3.7", "3.8"]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Run integration tests
+        run: |
+          ./aws/logs_monitoring/tools/integration_tests/integration_tests.sh --python-version=${{ matrix.python-version }}

.github/workflows/lambdachecks.yml → .github/workflows/lint.yml

@@ -1,28 +1,33 @@
-name: Lambda checks
+name: Lint
 
-on: [push]
+on: [pull_request]
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 4
-      matrix:
-        python-version: [3.7]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.7
+
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
+
       - name: Lint with flake8
         run: |
           pip install flake8
           flake8 ./aws/logs_monitoring/ --count --select=E9,F63,F7,F82 --show-source --statistics
+
       - name: Check formatting with Black
         run: |
           pip install black
           black --check ./aws/logs_monitoring
+
+      - name: Lint CloudFormation template with cfn-lint
+        uses: scottbrenner/cfn-lint-action@master
+        with:
+          args: "aws/logs_monitoring/template.yaml"

.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Python unit tests
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.7, 3.8]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Run Python unit tests
+        env:
+          AWS_DEFAULT_REGION: us-east-1
+          DD_API_KEY: "11111111111111111111111111111111"
+          DD_ADDITIONAL_TARGET_LAMBDAS: "ironmaiden,megadeth"
+        run: |
+          pip install boto3 mock
+          python -m unittest discover ./aws/logs_monitoring/

.github/workflows/trace_forwarder.yml

@@ -0,0 +1,12 @@
+name: Trace forwarder tests
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run trace forwarder tests
+        run: |
+          ./aws/logs_monitoring/trace_forwarder/scripts/run_tests.sh

.gitignore

@@ -1,6 +1,8 @@
+.DS_Store
 env
 base.zip
 */gen
 */env
 .vscode
 **/node_modules
+.idea

aws/logs_monitoring/.dockerignore

@@ -0,0 +1,9 @@
+*
+!lambda_function.py
+!enhanced_lambda_metrics.py
+!settings.py
+!setup.py
+!template.yaml
+!trace_forwarder/bin
+!trace_forwarder/__init__.py
+!trace_forwarder/connection.py

aws/logs_monitoring/.gitignore

@@ -1,2 +1,3 @@
 *.zip
-tools/layers
+tools/layers
+.forwarder