From 19ce4c5cc127a03033f3be1939017e1f4f8a88c3 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 09:06:18 -0600 Subject: [PATCH 01/16] Update contrib repo SHA Fixes #3235 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 710dd9bc91d..2b77fb81288 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ env: # Otherwise, set variable to the commit of your branch on # opentelemetry-python-contrib which is compatible with these Core repo # changes. - CONTRIB_REPO_SHA: 7fb0340445f5e0164bc59a3af1bf5836393013f4 + CONTRIB_REPO_SHA: e4d8f10ecd7bcd29c119af0e3ea7c30d4a383f4b # This is needed because we do not clone the core repo in contrib builds anymore. # When running contrib builds as part of core builds, we use actions/checkout@v2 which # does not set an environment variable (simply just runs tox), which is different when From 834065c3871e5f69467ff986a4586f3c578f838f Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 09:27:55 -0600 Subject: [PATCH 02/16] Make pip install more verbose --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9c43776a2c2..9bae2bcd128 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto getting-started: pip install requests==2.26.0 flask==2.0.1 - getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" + getting-started: pip install -vvv -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi" From 09045d81c82a8ae9800442079642cc46f6d57647 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 09:39:44 -0600 Subject: [PATCH 03/16] Revert last commit --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9bae2bcd128..9c43776a2c2 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto getting-started: pip install requests==2.26.0 flask==2.0.1 - getting-started: pip install -vvv -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" + getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi" From 7c8f40312c142b6c086bfa2c08f24ded5e617003 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 09:47:09 -0600 Subject: [PATCH 04/16] Revert last commit --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9c43776a2c2..9bae2bcd128 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto getting-started: pip install requests==2.26.0 flask==2.0.1 - getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" + getting-started: pip install -vvv -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi" From e5845c671594b90e156855d35de690bd40bb5e06 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 09:56:40 -0600 Subject: [PATCH 05/16] Revert last commit --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9bae2bcd128..9c43776a2c2 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto getting-started: pip install requests==2.26.0 flask==2.0.1 - getting-started: pip install -vvv -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" + getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi" From 2166db352192c1cbda3902e1e4b505895d08216b Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 10:31:43 -0600 Subject: [PATCH 06/16] Revert last commit --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9c43776a2c2..9bae2bcd128 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto getting-started: pip install requests==2.26.0 flask==2.0.1 - getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" + getting-started: pip install -vvv -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi" From 57336bd43a0e98dcb000d73203f182506a215f65 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 12:03:48 -0600 Subject: [PATCH 07/16] Revert last commit --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9bae2bcd128..9c43776a2c2 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto getting-started: pip install requests==2.26.0 flask==2.0.1 - getting-started: pip install -vvv -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" + getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi" From d30f10f67ae58cdeab79b0e3d4a539e7468449e0 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 12:09:53 -0600 Subject: [PATCH 08/16] Revert last commit --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9c43776a2c2..9bae2bcd128 100644 --- a/tox.ini +++ b/tox.ini @@ -130,7 +130,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto getting-started: pip install requests==2.26.0 flask==2.0.1 - getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" + getting-started: pip install -vvv -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi" From 317635752a20a2dd745b298a077ea944bf3a8d5c Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 12:21:14 -0600 Subject: [PATCH 09/16] Try with old SHA --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2b77fb81288..710dd9bc91d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ env: # Otherwise, set variable to the commit of your branch on # opentelemetry-python-contrib which is compatible with these Core repo # changes. - CONTRIB_REPO_SHA: e4d8f10ecd7bcd29c119af0e3ea7c30d4a383f4b + CONTRIB_REPO_SHA: 7fb0340445f5e0164bc59a3af1bf5836393013f4 # This is needed because we do not clone the core repo in contrib builds anymore. # When running contrib builds as part of core builds, we use actions/checkout@v2 which # does not set an environment variable (simply just runs tox), which is different when From 8bad27b968c2f50fe608e4422d194d53aca43a80 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 24 Mar 2023 12:55:37 -0600 Subject: [PATCH 10/16] Show pip version --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 9bae2bcd128..cff3a97d172 100644 --- a/tox.ini +++ b/tox.ini @@ -129,8 +129,9 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto + getting-started: pip --version getting-started: pip install requests==2.26.0 flask==2.0.1 - getting-started: pip install -vvv -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" + getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-requests&subdirectory=instrumentation/opentelemetry-instrumentation-requests" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation-wsgi&subdirectory=instrumentation/opentelemetry-instrumentation-wsgi" From d537f1ea93a043d916fa50809fb65a156a983590 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 27 Mar 2023 15:32:15 -0600 Subject: [PATCH 11/16] Remove show of pip version --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index cff3a97d172..9c43776a2c2 100644 --- a/tox.ini +++ b/tox.ini @@ -129,7 +129,6 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto - getting-started: pip --version getting-started: pip install requests==2.26.0 flask==2.0.1 getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" From 167d9510b19f315c26caa4ae147b8a5488f09cac Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 27 Mar 2023 16:58:36 -0600 Subject: [PATCH 12/16] Revert last commit --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 9c43776a2c2..cff3a97d172 100644 --- a/tox.ini +++ b/tox.ini @@ -129,6 +129,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto + getting-started: pip --version getting-started: pip install requests==2.26.0 flask==2.0.1 getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" From b8d23b54b88f513f8abafc147bf54ac332e49717 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 27 Mar 2023 17:50:39 -0600 Subject: [PATCH 13/16] Revert last commit --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index cff3a97d172..9c43776a2c2 100644 --- a/tox.ini +++ b/tox.ini @@ -129,7 +129,6 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto - getting-started: pip --version getting-started: pip install requests==2.26.0 flask==2.0.1 getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" From 595ab969616e86c0f36c53431cc42fdfe7b73c48 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 27 Mar 2023 17:55:42 -0600 Subject: [PATCH 14/16] Add fetch tags command --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 9c43776a2c2..f2507e0ce1a 100644 --- a/tox.ini +++ b/tox.ini @@ -129,6 +129,7 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto + getting-started: git fetch --tags getting-started: pip install requests==2.26.0 flask==2.0.1 getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" From 6917abf27630702329307a3bca2f9e0715355e69 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 27 Mar 2023 19:33:56 -0600 Subject: [PATCH 15/16] Try with tracing --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f2507e0ce1a..ac47412eac2 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ envlist = py3{7,8,9,10,11}-opentelemetry-api pypy3-opentelemetry-api - ; Test against both protobuf 3.x and 4.x + ; Test against both protobuf 3.x and 4.x py3{7,8,9,10,11}-proto{3,4}-opentelemetry-protobuf pypy3-proto{3,4}-opentelemetry-protobuf @@ -94,6 +94,9 @@ setenv = ; i.e: CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e CONTRIB_REPO_SHA={env:CONTRIB_REPO_SHA:"main"} CONTRIB_REPO="git+https://github.com/open-telemetry/opentelemetry-python-contrib.git@{env:CONTRIB_REPO_SHA}" + ; Enable more git debugging. With this change CI passes again (which is unexplained). See #3235. + GIT_TRACE=1 + GIT_TRACE_SETUP=true mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/tests/opentelemetry-test-utils/src/ changedir = @@ -129,7 +132,6 @@ commands_pre = protobuf: pip install {toxinidir}/opentelemetry-proto - getting-started: git fetch --tags getting-started: pip install requests==2.26.0 flask==2.0.1 getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" getting-started: pip install -e "{env:CONTRIB_REPO}#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation" From 86b263b2eda011da770179fbf18d188383b792db Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Tue, 28 Mar 2023 11:40:22 -0600 Subject: [PATCH 16/16] Remove git tracing --- tox.ini | 3 --- 1 file changed, 3 deletions(-) diff --git a/tox.ini b/tox.ini index ac47412eac2..843a0680ed9 100644 --- a/tox.ini +++ b/tox.ini @@ -94,9 +94,6 @@ setenv = ; i.e: CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e CONTRIB_REPO_SHA={env:CONTRIB_REPO_SHA:"main"} CONTRIB_REPO="git+https://github.com/open-telemetry/opentelemetry-python-contrib.git@{env:CONTRIB_REPO_SHA}" - ; Enable more git debugging. With this change CI passes again (which is unexplained). See #3235. - GIT_TRACE=1 - GIT_TRACE_SETUP=true mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/tests/opentelemetry-test-utils/src/ changedir =