Merge pull request #277 from getappmap/viraj-logging_20240210

Incorporate logging fix, fix the build

Author: apotterri

.travis.yml

@@ -15,9 +15,9 @@ if: type != push OR branch = master OR branch =~ /^v\d+\.\d+(\.\d+)?(-\S*)?$/
 before_install: |
   curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable --profile minimal
   source "$HOME/.cargo/env"
-  pip install --upgrade pip 'setuptools==65.6.2' 'poetry>=1.2.0'
+  pip -q install --upgrade pip 'setuptools==65.6.2' 'poetry>=1.2.0'
 
-install: pip install --upgrade "tox < 4" tox-travis
+install: pip -q install --upgrade "tox < 4" tox-travis
 script: tox
 
 cache:
@@ -32,15 +32,15 @@ jobs:
     services:
     - docker
     script:
-    - pip install poetry
+    - pip -q install poetry
     - poetry build
     - echo "$DOCKERHUB_PASSWORD" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
     - ci/run_tests.sh
   - stage: release
     if: branch = master
     script: skip
     before_deploy:
-    - pip install poetry
+    - pip -q install poetry
     - nvm install lts/*
     - npm i -g
       semantic-release

_appmap/env.py

@@ -165,4 +165,5 @@ def _configure_logging(self):
 
 def initialize(**kwargs):
     Env.reset(**kwargs)
-    logging.info("appmap enabled: %s", Env.current.enabled)
+    logger = logging.getLogger(__name__)
+    logger.info("appmap enabled: %s", Env.current.enabled)

ci/run_tests.sh

@@ -2,7 +2,7 @@
 
 set -x
 t=$([ -t 0 ] && echo 't')
-docker run -i${t} --rm\
+docker run -q -i${t} --rm\
   -v $PWD/dist:/dist -v $PWD/_appmap/test/data/unittest:/_appmap/test/data/unittest\
   -v $PWD/ci:/ci\
   -w /tmp\

ci/smoketest.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 set -ex
-pip install -U pip pytest "flask<2" python-decouple
-pip install /dist/appmap-*-py3-none-any.whl
+pip -q install -U pip pytest "flask<2" python-decouple
+pip -q install /dist/appmap-*-py3-none-any.whl
 
 cp -R /_appmap/test/data/unittest/simple ./.
 
@@ -12,7 +12,7 @@ cat /tmp/appmap.yml
 
 python -m appmap.command.appmap_agent_validate
 
-$RUNNER pytest -v -k test_hello_world
+$RUNNER pytest -k test_hello_world
 
 if [[ -f tmp/appmap/pytest/simple_test_simple_UnitTestTest_test_hello_world.appmap.json ]]; then
   echo 'Success'

ci/test_pipenv.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
-pip install pipenv
+pip -q install pipenv
 
 mkdir /pipenv || true
 cd /pipenv

ci/test_poetry.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 set -e
-pip install poetry
+pip -q install poetry
 
 mkdir /poetry || true
 cd /poetry

tox.ini

@@ -5,7 +5,7 @@ isolated_build = true
 envlist = py3{8,9,10,11,12}-web, py3{7,8,9,10,11,12}-flask1-django3
 
 [testenv]
-allowlist_externals = 
+allowlist_externals =
     env
     poetry
 
@@ -16,20 +16,20 @@ deps=
     flask1: -rrequirements-flask1.txt
     django3: Django >=3.2, <4.0
 
-    
+
 commands =
     # Turn off recording while installing. It's not necessary, and the warning messages that come
     # out of the agent confuse poetry.
     env APPMAP_LOG_LEVEL=warning APPMAP=false poetry install -v
     py310-web: poetry run pylint -j 0 appmap _appmap
-    web: poetry run {posargs:pytest -vv}
+    web: poetry run {posargs:pytest}
     flask1: poetry run pytest _appmap/test/test_flask.py
     django3: poetry run pytest _appmap/test/test_django.py
 
 [testenv:vendoring]
 skip_install = True
 deps = vendoring
-commands = 
+commands =
     poetry run vendoring {posargs:sync}
     # We don't need the .pyi files vendoring generates
     python -c 'from pathlib import Path; all(map(Path.unlink, Path("vendor").rglob("*.pyi")))'