From c1192383d33c4c6c4d00feeddc3253606efc3fe3 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Fri, 13 Oct 2023 08:46:09 +0530 Subject: [PATCH 01/60] coverage --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7aaf14d20..e384db647 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -61,6 +61,7 @@ commands: . venv/bin/activate coverage run --source=instana -m pytest -v --junitxml=test-results <> coverage report -m + coverage combine coverage html store-pytest-results: From 9ef068e2b0823e45c8f04e72d98be63c8da2e830 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Fri, 20 Oct 2023 08:19:24 +0530 Subject: [PATCH 02/60] coverage change --- .circleci/config.yml | 52 ++++++++++++++++++++++++++++++++++++++-- sonar-project.properties | 7 +++++- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e384db647..2a28d24f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,16 +58,53 @@ commands: COUCHBASE_TEST: "<>" GEVENT_TEST: "<>" command: | + echo "CIRCLE_BUILD_NUM" + echo ${CIRCLE_BUILD_NUM} . venv/bin/activate coverage run --source=instana -m pytest -v --junitxml=test-results <> coverage report -m - coverage combine - coverage html + mkdir coverage_results + cp -R .coverage coverage_results/.coverage-${CIRCLE_BUILD_NUM} + - persist_to_workspace: + root: . + paths: + - coverage_results store-pytest-results: steps: - store_test_results: path: test-results + run_sonarqube: + steps: + - attach_workspace: + at: . + - run: + name: Install Java + command: | + sudo apt-get update + sudo apt-get install openjdk-11-jdk + - run: + name: Run SonarQube to report the coverage + command: | + cd coverage_results + coverage combine . + coverage xml + wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip + unzip -d /tmp /tmp/sonar-scanner-cli.zip + if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then + /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ + -Dsonar.host.url="${SONARQUBE_URL}" \ + -Dsonar.login="${SONARQUBE_LOGIN}" \ + -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \ + -Dsonar.pullrequest.branch="${CIRCLE_BRANCH}" + else + /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ + -Dsonar.host.url="${SONARQUBE_URL}" \ + -Dsonar.login="${SONARQUBE_LOGIN}" \ + -Dsonar.branch.name="${CIRCLE_BRANCH}" + fi + store_artifacts: + path: htmlcov store-coverage-report: steps: @@ -296,3 +333,14 @@ workflows: - py37cassandra - py38couchbase - py38gevent + - run_sonarqube: + requires: + - python37 + - python38 + - python39 + - python310 + - python311 + - python312 + - py37cassandra + - py38couchbase + - py38gevent diff --git a/sonar-project.properties b/sonar-project.properties index 5e189de5e..61d791f93 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,5 +3,10 @@ sonar.projectName=Python Tracer sonar.sourceEncoding=utf-8 sonar.sources=. sonar.exclusions=tests/**/*, example/**/* -sonar.tests=. sonar.test.inclusions=tests/**/* +sonar.python.coverage.reportPaths=coverage.xml +sonar.links.homepage=https://github.com/instana/python-sensor/ +sonar.links.ci=https://circleci.com/gh/instana/python-sensor +sonar.links.issue=https://github.com/instana/python-sensor/issues +sonar.links.scm=https://github.com/instana/python-sensor/ + From 89dfe44a8f4f43fb2a7b271caad3a58662c8c3d7 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Fri, 20 Oct 2023 16:09:54 +0530 Subject: [PATCH 03/60] coverage change --- .circleci/config.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a28d24f6..256567ca4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -306,6 +306,11 @@ jobs: - store-pytest-results - store-coverage-report + final_job: + steps: + - checkout + - run_sonarqube + py38gevent: docker: - image: cimg/python:3.8.17 @@ -333,7 +338,7 @@ workflows: - py37cassandra - py38couchbase - py38gevent - - run_sonarqube: + - final_job: requires: - python37 - python38 From db21d61ce9e200668f0b0448f9296e6ebf9c97e9 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Fri, 20 Oct 2023 16:16:15 +0530 Subject: [PATCH 04/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 256567ca4..4e5bcd7e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -348,4 +348,4 @@ workflows: - python312 - py37cassandra - py38couchbase - - py38gevent + - py38gevent \ No newline at end of file From e4708efc0c1cab3d317f917e287e5eeef6e9ce43 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Fri, 20 Oct 2023 16:26:29 +0530 Subject: [PATCH 05/60] coverage change --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e5bcd7e2..61173b0e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -307,6 +307,8 @@ jobs: - store-coverage-report final_job: + docker: + - image: cimg/python:3.8.17 steps: - checkout - run_sonarqube From ce7f25d2d936a538f346e617621f348d95dc14f1 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Fri, 20 Oct 2023 16:46:10 +0530 Subject: [PATCH 06/60] coverage change --- .circleci/config.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 61173b0e4..f8331cd0d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,6 +65,7 @@ commands: coverage report -m mkdir coverage_results cp -R .coverage coverage_results/.coverage-${CIRCLE_BUILD_NUM} + ls - persist_to_workspace: root: . paths: @@ -311,6 +312,8 @@ jobs: - image: cimg/python:3.8.17 steps: - checkout + - pip-install-deps: + requirements: "tests/requirements-307.txt" - run_sonarqube py38gevent: @@ -331,23 +334,11 @@ workflows: version: 2 build: jobs: - - python37 - - python38 - - python39 - - python310 - - python311 - - python312 - py37cassandra - py38couchbase - py38gevent - final_job: requires: - - python37 - - python38 - - python39 - - python310 - - python311 - - python312 - py37cassandra - py38couchbase - py38gevent \ No newline at end of file From fc90028a2981a1f538feb6d047ed5a28c3eeb1f4 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Fri, 20 Oct 2023 17:09:35 +0530 Subject: [PATCH 07/60] coverage change --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f8331cd0d..2a89bd931 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,6 +65,7 @@ commands: coverage report -m mkdir coverage_results cp -R .coverage coverage_results/.coverage-${CIRCLE_BUILD_NUM} + cd coverage_results ls - persist_to_workspace: root: . @@ -87,7 +88,7 @@ commands: - run: name: Run SonarQube to report the coverage command: | - cd coverage_results + cp ./coverage_results/* . coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip @@ -335,10 +336,8 @@ workflows: build: jobs: - py37cassandra - - py38couchbase - py38gevent - final_job: requires: - py37cassandra - - py38couchbase - py38gevent \ No newline at end of file From ec04993fbb77dd947530599ce03c4c7760155bf0 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Fri, 20 Oct 2023 17:30:57 +0530 Subject: [PATCH 08/60] coverage change --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a89bd931..843f1a5f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,6 +63,7 @@ commands: . venv/bin/activate coverage run --source=instana -m pytest -v --junitxml=test-results <> coverage report -m + coverage html mkdir coverage_results cp -R .coverage coverage_results/.coverage-${CIRCLE_BUILD_NUM} cd coverage_results @@ -88,6 +89,8 @@ commands: - run: name: Run SonarQube to report the coverage command: | + pwd + ls cp ./coverage_results/* . coverage combine . coverage xml From 11e47a2e76bcb32f851219f21b6bb216cba46b1b Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 10:52:33 +0530 Subject: [PATCH 09/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 843f1a5f1..a7c214f29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -91,7 +91,7 @@ commands: command: | pwd ls - cp ./coverage_results/* . + cp coverage_results/* . coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 4bd1a3d22b5eca1fb08907835df4ac817426f07f Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 10:57:46 +0530 Subject: [PATCH 10/60] coverage change --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a7c214f29..c3f09f3b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -91,6 +91,7 @@ commands: command: | pwd ls + ls coverage_results cp coverage_results/* . coverage combine . coverage xml From 5d344f456a51d183f3d2d1e5cdd02a61c679ef70 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 11:18:42 +0530 Subject: [PATCH 11/60] coverage change --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3f09f3b3..9fc98f096 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,6 +65,7 @@ commands: coverage report -m coverage html mkdir coverage_results + ls -A cp -R .coverage coverage_results/.coverage-${CIRCLE_BUILD_NUM} cd coverage_results ls From 1cf06e9ca6abcd270f0fb865f3c0f68be799009f Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 11:31:05 +0530 Subject: [PATCH 12/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9fc98f096..2f4b72ddc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,7 +68,7 @@ commands: ls -A cp -R .coverage coverage_results/.coverage-${CIRCLE_BUILD_NUM} cd coverage_results - ls + ls -A - persist_to_workspace: root: . paths: From 3d6aa2568760c70266be0988d533dc888c253260 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 12:07:45 +0530 Subject: [PATCH 13/60] coverage change --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f4b72ddc..10c8af882 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,7 +92,8 @@ commands: command: | pwd ls - ls coverage_results + cd + ls -a coverage_results cp coverage_results/* . coverage combine . coverage xml From 9c074c498d62396a376ae6494e7794e3b47ec364 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 12:14:19 +0530 Subject: [PATCH 14/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 10c8af882..89c65806a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -93,7 +93,7 @@ commands: pwd ls cd - ls -a coverage_results + ls -a /home/circleci/project/coverage_results cp coverage_results/* . coverage combine . coverage xml From 4578b64a800fbb494ad9ab70f1f790436abb34f9 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 12:17:41 +0530 Subject: [PATCH 15/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 89c65806a..8b305b7a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -94,7 +94,7 @@ commands: ls cd ls -a /home/circleci/project/coverage_results - cp coverage_results/* . + cp /home/circleci/project/coverage_results/* . coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From adfb5f4c10c6d8b8974e06a25d50435e3170ed19 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 12:25:34 +0530 Subject: [PATCH 16/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b305b7a2..00e326c49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -94,7 +94,7 @@ commands: ls cd ls -a /home/circleci/project/coverage_results - cp /home/circleci/project/coverage_results/* . + cp -R /home/circleci/project/coverage_results/ . coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 0b2762ea2a757815178420cb62ed9e1297c6eb05 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 13:14:06 +0530 Subject: [PATCH 17/60] coverage change --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00e326c49..ba07e61b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,6 +95,7 @@ commands: cd ls -a /home/circleci/project/coverage_results cp -R /home/circleci/project/coverage_results/ . + . venv/bin/activate coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From d4f6cfac7121c7d53af581853811d91c1d7f1a6d Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 13:19:22 +0530 Subject: [PATCH 18/60] coverage change --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba07e61b1..5bffae171 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -91,11 +91,9 @@ commands: name: Run SonarQube to report the coverage command: | pwd - ls - cd + . venv/bin/activate ls -a /home/circleci/project/coverage_results cp -R /home/circleci/project/coverage_results/ . - . venv/bin/activate coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 16914f6a6ff50de4818ff68909d41d0867bd8a6a Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 13:52:10 +0530 Subject: [PATCH 19/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5bffae171..b0398adf4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -93,7 +93,7 @@ commands: pwd . venv/bin/activate ls -a /home/circleci/project/coverage_results - cp -R /home/circleci/project/coverage_results/ . + cp /home/circleci/project/coverage_results/* /home/circleci/project/ coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 15e423aac35d84f6d928e22e2cda7fd94d7d08c3 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 14:02:56 +0530 Subject: [PATCH 20/60] coverage change --- .circleci/config.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0398adf4..d513f73a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,10 +90,17 @@ commands: - run: name: Run SonarQube to report the coverage command: | + echo "Files under coverage_results" + ls -a /home/circleci/project/coverage_results + cd /home/circleci/project/coverage_results + cp * /home/circleci/project + ls -a + pwd + cd /home/circleci/project pwd + ls -a . venv/bin/activate - ls -a /home/circleci/project/coverage_results - cp /home/circleci/project/coverage_results/* /home/circleci/project/ + # cp /home/circleci/project/coverage_results/* /home/circleci/project/ coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 385526ef436ce29b16bbcee0c97a31d89049987a Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 14:15:54 +0530 Subject: [PATCH 21/60] coverage change --- .circleci/config.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d513f73a8..70d58b6ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,17 +90,13 @@ commands: - run: name: Run SonarQube to report the coverage command: | - echo "Files under coverage_results" - ls -a /home/circleci/project/coverage_results - cd /home/circleci/project/coverage_results - cp * /home/circleci/project - ls -a - pwd - cd /home/circleci/project pwd - ls -a . venv/bin/activate - # cp /home/circleci/project/coverage_results/* /home/circleci/project/ + ls -a /home/circleci/project/coverage_results + cd /home/circleci/project/coverage_results + ls -a + cp * /home/circleci/project/ + ls -a coverage combine . coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 38de906d86b24ac8877eff32f55d95977a734c36 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 14:25:34 +0530 Subject: [PATCH 22/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70d58b6ad..6e4f40845 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,7 +95,7 @@ commands: ls -a /home/circleci/project/coverage_results cd /home/circleci/project/coverage_results ls -a - cp * /home/circleci/project/ + cp -a * /home/circleci/project/ ls -a coverage combine . coverage xml From 4af3caa3929f05b11c491092899ea57c73d0823f Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 14:29:13 +0530 Subject: [PATCH 23/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e4f40845..6d141e3e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,7 +95,7 @@ commands: ls -a /home/circleci/project/coverage_results cd /home/circleci/project/coverage_results ls -a - cp -a * /home/circleci/project/ + cp -a . /home/circleci/project/ ls -a coverage combine . coverage xml From 4b93ee069145ec752fcc6a4455d96de4ce9cd66a Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 14:34:28 +0530 Subject: [PATCH 24/60] coverage change --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d141e3e9..25db407c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -92,10 +92,9 @@ commands: command: | pwd . venv/bin/activate - ls -a /home/circleci/project/coverage_results cd /home/circleci/project/coverage_results - ls -a cp -a . /home/circleci/project/ + cd /home/circleci/project/ ls -a coverage combine . coverage xml From c44d2db56e4c8069bde00bf5e983cb6b4413a4bb Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 14:43:44 +0530 Subject: [PATCH 25/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 25db407c6..1d74a204c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -96,7 +96,7 @@ commands: cp -a . /home/circleci/project/ cd /home/circleci/project/ ls -a - coverage combine . + coverage combine .coverage* coverage xml wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip From 68653ade61c32cd134dcdbd929e932be8396184b Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 14:59:01 +0530 Subject: [PATCH 26/60] coverage change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1d74a204c..8e93530f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,7 +97,7 @@ commands: cd /home/circleci/project/ ls -a coverage combine .coverage* - coverage xml + coverage xml -i wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then From 57da2538b06592e0d84c4f75e74533ec149e34ed Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 15:16:25 +0530 Subject: [PATCH 27/60] coverage change --- .circleci/config.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e93530f2..64e25f9f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,17 +100,24 @@ commands: coverage xml -i wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip + export SONARQUBE_TOKEN=((sonarqube-instana-io-token)) + echo ${CIRCLE_PR_NUMBER} + echo ${SONARQUBE_TOKEN} + echo ${CIRCLE_BRANCH} if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ - -Dsonar.host.url="${SONARQUBE_URL}" \ - -Dsonar.login="${SONARQUBE_LOGIN}" \ + -Dsonar.host.url=https://sonarqube.instana.io/ \ + -Dsonar.login="${SONARQUBE_TOKEN}" \ -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \ + -Dsonar.projectKey=Python-Tracer \ -Dsonar.pullrequest.branch="${CIRCLE_BRANCH}" else /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ - -Dsonar.host.url="${SONARQUBE_URL}" \ - -Dsonar.login="${SONARQUBE_LOGIN}" \ + -Dsonar.host.url=https://sonarqube.instana.io/ \ + -Dsonar.login="${SONARQUBE_TOKEN}" \ + -Dsonar.projectKey=Python-Tracer \ -Dsonar.branch.name="${CIRCLE_BRANCH}" + echo "inside else" fi store_artifacts: path: htmlcov From 178727de55926e346551d2fb1a3a37e26ea26997 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Wed, 25 Oct 2023 15:54:10 +0530 Subject: [PATCH 28/60] coverage change --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64e25f9f7..1e57e9ec0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,14 +100,14 @@ commands: coverage xml -i wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip - export SONARQUBE_TOKEN=((sonarqube-instana-io-token)) - echo ${CIRCLE_PR_NUMBER} + echo ${SONARQUBE_LOGIN} echo ${SONARQUBE_TOKEN} echo ${CIRCLE_BRANCH} + echo ${CIRCLE_PR_NUMBER} if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ -Dsonar.host.url=https://sonarqube.instana.io/ \ - -Dsonar.login="${SONARQUBE_TOKEN}" \ + -Dsonar.login="${SONARQUBE_LOGIN}" \ -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \ -Dsonar.projectKey=Python-Tracer \ -Dsonar.pullrequest.branch="${CIRCLE_BRANCH}" From e5909d5d012404ee61cf2c333c58a61c870761a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= Date: Thu, 26 Oct 2023 13:00:00 +0000 Subject: [PATCH 29/60] fix: Use SONARQUBE_LOGIN everywhere MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ferenc Géczi --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e57e9ec0..09f7a7647 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,12 +101,11 @@ commands: wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip echo ${SONARQUBE_LOGIN} - echo ${SONARQUBE_TOKEN} echo ${CIRCLE_BRANCH} echo ${CIRCLE_PR_NUMBER} if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ - -Dsonar.host.url=https://sonarqube.instana.io/ \ + -Dsonar.host.url=${SONARQUBE_URL} \ -Dsonar.login="${SONARQUBE_LOGIN}" \ -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \ -Dsonar.projectKey=Python-Tracer \ @@ -114,7 +113,7 @@ commands: else /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ -Dsonar.host.url=https://sonarqube.instana.io/ \ - -Dsonar.login="${SONARQUBE_TOKEN}" \ + -Dsonar.login="${SONARQUBE_LOGIN}" \ -Dsonar.projectKey=Python-Tracer \ -Dsonar.branch.name="${CIRCLE_BRANCH}" echo "inside else" @@ -354,4 +353,4 @@ workflows: - final_job: requires: - py37cassandra - - py38gevent \ No newline at end of file + - py38gevent From d80f843f0cc3433488dd705b96b321c0c914d821 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Thu, 26 Oct 2023 16:17:22 +0530 Subject: [PATCH 30/60] code coverage --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 09f7a7647..9a849d583 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,12 +98,11 @@ commands: ls -a coverage combine .coverage* coverage xml -i + ls -a wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip - echo ${SONARQUBE_LOGIN} - echo ${CIRCLE_BRANCH} - echo ${CIRCLE_PR_NUMBER} if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then + echo "inside if" /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ -Dsonar.host.url=${SONARQUBE_URL} \ -Dsonar.login="${SONARQUBE_LOGIN}" \ From eb2f34c6aee38448aa8195304a71709322f5f877 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Thu, 26 Oct 2023 16:33:12 +0530 Subject: [PATCH 31/60] code coverage --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a849d583..64ef82dfd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,10 +95,10 @@ commands: cd /home/circleci/project/coverage_results cp -a . /home/circleci/project/ cd /home/circleci/project/ - ls -a + ls -a -ltr coverage combine .coverage* coverage xml -i - ls -a + ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then From c9ee624974ac1057ceab65f7e736159383e0910f Mon Sep 17 00:00:00 2001 From: Ragi George Date: Thu, 26 Oct 2023 16:50:40 +0530 Subject: [PATCH 32/60] code coverage --- .circleci/config.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64ef82dfd..30ec00e7e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -347,9 +347,23 @@ workflows: version: 2 build: jobs: + - python37 + - python38 + - python39 + - python310 + - python311 + - python312 - py37cassandra + - py38couchbase - py38gevent - final_job: requires: + - python37 + - python38 + - python39 + - python310 + - python311 + - python312 - py37cassandra + - py38couchbase - py38gevent From f670a46d591f44cd73fb8f1c93743918ce9d8e8b Mon Sep 17 00:00:00 2001 From: Ragi George Date: Thu, 26 Oct 2023 17:51:49 +0530 Subject: [PATCH 33/60] code coverage --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 30ec00e7e..bcaa60a48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -66,7 +66,7 @@ commands: coverage html mkdir coverage_results ls -A - cp -R .coverage coverage_results/.coverage-${CIRCLE_BUILD_NUM} + cp -R .coverage coverage_results/.coverage.${CIRCLE_BUILD_NUM} cd coverage_results ls -A - persist_to_workspace: @@ -96,7 +96,7 @@ commands: cp -a . /home/circleci/project/ cd /home/circleci/project/ ls -a -ltr - coverage combine .coverage* + coverage combine coverage xml -i ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From bf7794e99484f6ccca3aed907b02f8077475343a Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 14:14:56 +0530 Subject: [PATCH 34/60] coverage test --- .circleci/config.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bcaa60a48..a6dbec59a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,7 +97,7 @@ commands: cd /home/circleci/project/ ls -a -ltr coverage combine - coverage xml -i + coverage xml ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip @@ -347,23 +347,9 @@ workflows: version: 2 build: jobs: - - python37 - - python38 - - python39 - - python310 - - python311 - - python312 - - py37cassandra - py38couchbase - py38gevent - final_job: requires: - - python37 - - python38 - - python39 - - python310 - - python311 - - python312 - - py37cassandra - py38couchbase - py38gevent From d171684c4bbd998f2f735c44a878b103495e233f Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 14:55:47 +0530 Subject: [PATCH 35/60] coverage test --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 61d791f93..3b3126a49 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ sonar.projectKey=Python-Tracer sonar.projectName=Python Tracer sonar.sourceEncoding=utf-8 -sonar.sources=. +sonar.sources=./instana sonar.exclusions=tests/**/*, example/**/* sonar.test.inclusions=tests/**/* sonar.python.coverage.reportPaths=coverage.xml From 5e089582e0adab0c93aa5138538ac1085f3fcbfd Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 15:15:06 +0530 Subject: [PATCH 36/60] coverage test --- .circleci/config.yml | 4 +++- sonar-project.properties | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6dbec59a..ed3bd50e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,7 +97,9 @@ commands: cd /home/circleci/project/ ls -a -ltr coverage combine - coverage xml + echo "started coverage xml" + coverage xml + echo "end coverage xml" ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip diff --git a/sonar-project.properties b/sonar-project.properties index 3b3126a49..cc0a32ff0 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ sonar.projectKey=Python-Tracer sonar.projectName=Python Tracer sonar.sourceEncoding=utf-8 -sonar.sources=./instana +sonar.sources=instana sonar.exclusions=tests/**/*, example/**/* sonar.test.inclusions=tests/**/* sonar.python.coverage.reportPaths=coverage.xml From b1e7e7e4b6134bf9a8f146b276690724d47a43e9 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 15:23:53 +0530 Subject: [PATCH 37/60] coverage test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed3bd50e2..8352336f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,7 +98,7 @@ commands: ls -a -ltr coverage combine echo "started coverage xml" - coverage xml + coverage xml --include=./instana echo "end coverage xml" ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 23788566b77e704930c87a4c06c0cf8666f01470 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 16:53:14 +0530 Subject: [PATCH 38/60] code coverage --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8352336f0..ed3bd50e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,7 +98,7 @@ commands: ls -a -ltr coverage combine echo "started coverage xml" - coverage xml --include=./instana + coverage xml echo "end coverage xml" ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 075862462c171991a35ea7b7402c4e71a7e51922 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 17:10:27 +0530 Subject: [PATCH 39/60] code coverage --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index cc0a32ff0..3b3126a49 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ sonar.projectKey=Python-Tracer sonar.projectName=Python Tracer sonar.sourceEncoding=utf-8 -sonar.sources=instana +sonar.sources=./instana sonar.exclusions=tests/**/*, example/**/* sonar.test.inclusions=tests/**/* sonar.python.coverage.reportPaths=coverage.xml From 018ecad96f79d495a52bceeb95384cd000113e2a Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 22:29:15 +0530 Subject: [PATCH 40/60] code coverage --- .coveragerc | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 000000000..361532ab5 --- /dev/null +++ b/.coveragerc @@ -0,0 +1,6 @@ +[run] +source = + instana/* + tests/* + . + From 04047939cf19393b8f8df9f064a8fb3608e7a712 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 22:48:23 +0530 Subject: [PATCH 41/60] code coverage --- .coveragerc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 361532ab5..e0bf8ea9f 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,4 +1,4 @@ -[run] +[path] source = instana/* tests/* From f5d8b8ec8132f667564532882a7db1e96628f077 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 23:04:58 +0530 Subject: [PATCH 42/60] code coverage --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ed3bd50e2..7eaf7d3e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,8 +97,10 @@ commands: cd /home/circleci/project/ ls -a -ltr coverage combine + echo "started coverage html" + covergae html echo "started coverage xml" - coverage xml + coverage xml -i echo "end coverage xml" ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 9274dd2bbaaaf3241a25350bf50a5f7001ed3be6 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Mon, 30 Oct 2023 23:12:53 +0530 Subject: [PATCH 43/60] code coverage --- .circleci/config.yml | 2 +- .coveragerc | 6 +++--- sonar-project.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7eaf7d3e0..0ed5d95c5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,7 +98,7 @@ commands: ls -a -ltr coverage combine echo "started coverage html" - covergae html + coverage html echo "started coverage xml" coverage xml -i echo "end coverage xml" diff --git a/.coveragerc b/.coveragerc index e0bf8ea9f..c071410c3 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,6 @@ [path] source = - instana/* - tests/* . - +[run] +source = + . diff --git a/sonar-project.properties b/sonar-project.properties index 3b3126a49..61d791f93 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,7 +1,7 @@ sonar.projectKey=Python-Tracer sonar.projectName=Python Tracer sonar.sourceEncoding=utf-8 -sonar.sources=./instana +sonar.sources=. sonar.exclusions=tests/**/*, example/**/* sonar.test.inclusions=tests/**/* sonar.python.coverage.reportPaths=coverage.xml From ce9449d6f19321f43e2e5acf18624120d5120792 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 09:37:13 +0530 Subject: [PATCH 44/60] coverage --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ed5d95c5..fbf7097d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,8 +95,11 @@ commands: cd /home/circleci/project/coverage_results cp -a . /home/circleci/project/ cd /home/circleci/project/ + coverage report -m ls -a -ltr coverage combine + echo "after coverage combine" + ls -a -ltr echo "started coverage html" coverage html echo "started coverage xml" From 715ff32bde2b682d4848f2e1cc8c314ed820e78f Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 09:43:01 +0530 Subject: [PATCH 45/60] coverage --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fbf7097d9..5f6bffd61 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,9 +95,9 @@ commands: cd /home/circleci/project/coverage_results cp -a . /home/circleci/project/ cd /home/circleci/project/ - coverage report -m ls -a -ltr coverage combine + coverage report -m echo "after coverage combine" ls -a -ltr echo "started coverage html" From 294b7b2f8599bf32b4a81c63e040800956170ad5 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 09:51:36 +0530 Subject: [PATCH 46/60] coverage --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f6bffd61..75d9d0733 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,6 +97,14 @@ commands: cd /home/circleci/project/ ls -a -ltr coverage combine + ls -a -ltr + coverage config + echo "##########after coverage config##########" + coverage sys + echo "##########after coverage sys##########" + coverage data + echo "##########after coverage data##########" + echo "after coverage combine" coverage report -m echo "after coverage combine" ls -a -ltr From ddd40b2df7e2b7ec404f050764a8fe0f07240198 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 09:58:10 +0530 Subject: [PATCH 47/60] coverage --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 75d9d0733..509ab3463 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,11 +98,11 @@ commands: ls -a -ltr coverage combine ls -a -ltr - coverage config + coverage debug config echo "##########after coverage config##########" - coverage sys + coverage debug sys echo "##########after coverage sys##########" - coverage data + coverage debug data echo "##########after coverage data##########" echo "after coverage combine" coverage report -m From 9e3b4186b7e2ccf03530285c995367b81e1ef782 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 10:31:19 +0530 Subject: [PATCH 48/60] coverage --- .coveragerc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index c071410c3..1743a4532 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,6 @@ [path] source = - . + ./instana [run] source = - . + ./instana From ff6ecbce92700c0baa144ac42fd42950babeb3dc Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 10:39:59 +0530 Subject: [PATCH 49/60] coverage --- .coveragerc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index 1743a4532..5dc908ed7 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,6 @@ [path] source = - ./instana + instana [run] source = - ./instana + instana From b08d93999f9164eb5b9efe61dd1c4695c834c507 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 11:24:03 +0530 Subject: [PATCH 50/60] coverage --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 509ab3463..62e061644 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,6 +62,14 @@ commands: echo ${CIRCLE_BUILD_NUM} . venv/bin/activate coverage run --source=instana -m pytest -v --junitxml=test-results <> + ls -a -ltr + coverage debug config + echo "##########after coverage config##########" + coverage debug sys + echo "##########after coverage sys##########" + coverage debug data + echo "##########after coverage data##########" + echo "after coverage data" coverage report -m coverage html mkdir coverage_results From 298d27c865f5d2099f2fdb3b9b632669e7633d8e Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 11:56:00 +0530 Subject: [PATCH 51/60] coverage --- .circleci/config.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 62e061644..3a24817b2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -87,11 +87,18 @@ commands: - store_test_results: path: test-results run_sonarqube: + parameters: + tests: + default: "tests" + type: string steps: - - attach_workspace: - at: . - run: name: Install Java + environment: + INSTANA_TEST: "true" + CASSANDRA_TEST: "<>" + COUCHBASE_TEST: "<>" + GEVENT_TEST: "<>" command: | sudo apt-get update sudo apt-get install openjdk-11-jdk From 61d492b375c20f0be8917c0bb4d3febd7596375c Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 12:04:17 +0530 Subject: [PATCH 52/60] coverage --- .circleci/config.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a24817b2..323d7a5f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -87,18 +87,9 @@ commands: - store_test_results: path: test-results run_sonarqube: - parameters: - tests: - default: "tests" - type: string steps: - run: name: Install Java - environment: - INSTANA_TEST: "true" - CASSANDRA_TEST: "<>" - COUCHBASE_TEST: "<>" - GEVENT_TEST: "<>" command: | sudo apt-get update sudo apt-get install openjdk-11-jdk From 1ef5df67340e7be23bd1090a06c1c229a7f9be0c Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 12:32:58 +0530 Subject: [PATCH 53/60] coverage --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 323d7a5f3..aa350e936 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,6 +58,7 @@ commands: COUCHBASE_TEST: "<>" GEVENT_TEST: "<>" command: | + pwd echo "CIRCLE_BUILD_NUM" echo ${CIRCLE_BUILD_NUM} . venv/bin/activate @@ -88,6 +89,8 @@ commands: path: test-results run_sonarqube: steps: + - attach_workspace: + at: . - run: name: Install Java command: | @@ -344,10 +347,12 @@ jobs: final_job: docker: - image: cimg/python:3.8.17 + working_directory: ~/repo steps: - checkout - pip-install-deps: requirements: "tests/requirements-307.txt" + - store-pytest-results - run_sonarqube py38gevent: @@ -368,9 +373,7 @@ workflows: version: 2 build: jobs: - - py38couchbase - py38gevent - final_job: requires: - - py38couchbase - py38gevent From f53f9d30a0b9b8ba7241be7728bb1c6e7eadaca2 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 12:42:01 +0530 Subject: [PATCH 54/60] coverage --- .circleci/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa350e936..4516a669a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -101,11 +101,12 @@ commands: command: | pwd . venv/bin/activate - cd /home/circleci/project/coverage_results - cp -a . /home/circleci/project/ - cd /home/circleci/project/ ls -a -ltr - coverage combine + # cd ./coverage_results + # cp -a . /home/circleci/project/ + # cd /home/circleci/project/ + ls -a -ltr + coverage combine ./coverage_results ls -a -ltr coverage debug config echo "##########after coverage config##########" From e8e45814c0132bacd74ca1aba980fe824acb532e Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 12:44:32 +0530 Subject: [PATCH 55/60] coverage --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4516a669a..5080e38e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -102,10 +102,6 @@ commands: pwd . venv/bin/activate ls -a -ltr - # cd ./coverage_results - # cp -a . /home/circleci/project/ - # cd /home/circleci/project/ - ls -a -ltr coverage combine ./coverage_results ls -a -ltr coverage debug config From 6b4e0a309fe21f2bf4036937b1b8d5c2a6269608 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 12:51:50 +0530 Subject: [PATCH 56/60] coverage --- .circleci/config.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5080e38e7..bfd793bba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,18 +59,9 @@ commands: GEVENT_TEST: "<>" command: | pwd - echo "CIRCLE_BUILD_NUM" - echo ${CIRCLE_BUILD_NUM} . venv/bin/activate coverage run --source=instana -m pytest -v --junitxml=test-results <> ls -a -ltr - coverage debug config - echo "##########after coverage config##########" - coverage debug sys - echo "##########after coverage sys##########" - coverage debug data - echo "##########after coverage data##########" - echo "after coverage data" coverage report -m coverage html mkdir coverage_results @@ -104,21 +95,10 @@ commands: ls -a -ltr coverage combine ./coverage_results ls -a -ltr - coverage debug config - echo "##########after coverage config##########" - coverage debug sys - echo "##########after coverage sys##########" - coverage debug data - echo "##########after coverage data##########" - echo "after coverage combine" coverage report -m - echo "after coverage combine" ls -a -ltr - echo "started coverage html" coverage html - echo "started coverage xml" coverage xml -i - echo "end coverage xml" ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip @@ -370,7 +350,9 @@ workflows: version: 2 build: jobs: + - py38couchbase - py38gevent - final_job: requires: + - py38couchbase - py38gevent From ecd0a4a50764e6862587f0fe4e25be4fe53cfbd7 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 12:57:50 +0530 Subject: [PATCH 57/60] coverage --- .circleci/config.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index bfd793bba..695d4e80e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -350,9 +350,23 @@ workflows: version: 2 build: jobs: + - python37 + - python38 + - python39 + - python310 + - python311 + - python312 + - py37cassandra - py38couchbase - py38gevent - final_job: requires: + - python37 + - python38 + - python39 + - python310 + - python311 + - python312 + - py37cassandra - py38couchbase - py38gevent From c5ff1e1642da8f060dc4dd3842a3eccdd95b773a Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 13:24:39 +0530 Subject: [PATCH 58/60] coverage --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 695d4e80e..6cc56b06c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,9 +95,6 @@ commands: ls -a -ltr coverage combine ./coverage_results ls -a -ltr - coverage report -m - ls -a -ltr - coverage html coverage xml -i ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip From 65cb601e8576523cd5f57c149fc38436dcf2638e Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 13:42:11 +0530 Subject: [PATCH 59/60] coverage --- .coveragerc | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 5dc908ed7..000000000 --- a/.coveragerc +++ /dev/null @@ -1,6 +0,0 @@ -[path] -source = - instana -[run] -source = - instana From 0f55c50119ec92a4bcc6ff0678861669b9760471 Mon Sep 17 00:00:00 2001 From: Ragi George Date: Tue, 31 Oct 2023 13:54:41 +0530 Subject: [PATCH 60/60] coverage --- .circleci/config.yml | 10 ---------- sonar-project.properties | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6cc56b06c..ec72e4acb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -58,17 +58,13 @@ commands: COUCHBASE_TEST: "<>" GEVENT_TEST: "<>" command: | - pwd . venv/bin/activate coverage run --source=instana -m pytest -v --junitxml=test-results <> - ls -a -ltr coverage report -m coverage html mkdir coverage_results - ls -A cp -R .coverage coverage_results/.coverage.${CIRCLE_BUILD_NUM} cd coverage_results - ls -A - persist_to_workspace: root: . paths: @@ -90,17 +86,12 @@ commands: - run: name: Run SonarQube to report the coverage command: | - pwd . venv/bin/activate - ls -a -ltr coverage combine ./coverage_results - ls -a -ltr coverage xml -i - ls -a -ltr wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip unzip -d /tmp /tmp/sonar-scanner-cli.zip if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then - echo "inside if" /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \ -Dsonar.host.url=${SONARQUBE_URL} \ -Dsonar.login="${SONARQUBE_LOGIN}" \ @@ -113,7 +104,6 @@ commands: -Dsonar.login="${SONARQUBE_LOGIN}" \ -Dsonar.projectKey=Python-Tracer \ -Dsonar.branch.name="${CIRCLE_BRANCH}" - echo "inside else" fi store_artifacts: path: htmlcov diff --git a/sonar-project.properties b/sonar-project.properties index 61d791f93..6dea20a98 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -8,5 +8,4 @@ sonar.python.coverage.reportPaths=coverage.xml sonar.links.homepage=https://github.com/instana/python-sensor/ sonar.links.ci=https://circleci.com/gh/instana/python-sensor sonar.links.issue=https://github.com/instana/python-sensor/issues -sonar.links.scm=https://github.com/instana/python-sensor/ - +sonar.links.scm=https://github.com/instana/python-sensor/ \ No newline at end of file