From e0afd225a6171cbb224a8e66a82d56f09e050c26 Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 27 Jul 2021 10:50:03 +1000 Subject: [PATCH 1/4] fix: avoid bad version of `opentelemetry-instrumentation` --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fcfee67800..ac49a7131a 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ "tracing": [ "opentelemetry-api >= 1.1.0", "opentelemetry-sdk >= 1.1.0", - "opentelemetry-instrumentation >= 0.20b0", + "opentelemetry-instrumentation >= 0.20b0, != 0.23b0", ], "libcst": "libcst >= 0.2.5", } From 1f3a4ebb33bfd4d495ebd89ac042c22998e359ef Mon Sep 17 00:00:00 2001 From: larkee Date: Tue, 27 Jul 2021 17:02:10 +1000 Subject: [PATCH 2/4] test: pin test dependencies --- testing/constraints-3.10.txt | 17 +++++++++++++++++ testing/constraints-3.11.txt | 17 +++++++++++++++++ testing/constraints-3.7.txt | 17 +++++++++++++++++ testing/constraints-3.8.txt | 17 +++++++++++++++++ testing/constraints-3.9.txt | 17 +++++++++++++++++ 5 files changed, 85 insertions(+) diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt index e69de29bb2..2eac9c8653 100644 --- a/testing/constraints-3.10.txt +++ b/testing/constraints-3.10.txt @@ -0,0 +1,17 @@ +# This constraints file is used to check that lower bounds +# are correct in setup.py +# List *all* library dependencies and extras in this file. +# Pin the version to the lower bound. +# +# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", +# Then this file should have foo==1.14.0 +google-api-core==1.26.0 +google-cloud-core==1.4.1 +grpc-google-iam-v1==0.12.3 +libcst==0.2.5 +proto-plus==1.13.0 +sqlparse==0.3.0 +opentelemetry-api==1.1.0 +opentelemetry-sdk==1.1.0 +opentelemetry-instrumentation==0.20b0 +packaging==14.3 diff --git a/testing/constraints-3.11.txt b/testing/constraints-3.11.txt index e69de29bb2..2eac9c8653 100644 --- a/testing/constraints-3.11.txt +++ b/testing/constraints-3.11.txt @@ -0,0 +1,17 @@ +# This constraints file is used to check that lower bounds +# are correct in setup.py +# List *all* library dependencies and extras in this file. +# Pin the version to the lower bound. +# +# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", +# Then this file should have foo==1.14.0 +google-api-core==1.26.0 +google-cloud-core==1.4.1 +grpc-google-iam-v1==0.12.3 +libcst==0.2.5 +proto-plus==1.13.0 +sqlparse==0.3.0 +opentelemetry-api==1.1.0 +opentelemetry-sdk==1.1.0 +opentelemetry-instrumentation==0.20b0 +packaging==14.3 diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index e69de29bb2..2eac9c8653 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -0,0 +1,17 @@ +# This constraints file is used to check that lower bounds +# are correct in setup.py +# List *all* library dependencies and extras in this file. +# Pin the version to the lower bound. +# +# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", +# Then this file should have foo==1.14.0 +google-api-core==1.26.0 +google-cloud-core==1.4.1 +grpc-google-iam-v1==0.12.3 +libcst==0.2.5 +proto-plus==1.13.0 +sqlparse==0.3.0 +opentelemetry-api==1.1.0 +opentelemetry-sdk==1.1.0 +opentelemetry-instrumentation==0.20b0 +packaging==14.3 diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt index e69de29bb2..2eac9c8653 100644 --- a/testing/constraints-3.8.txt +++ b/testing/constraints-3.8.txt @@ -0,0 +1,17 @@ +# This constraints file is used to check that lower bounds +# are correct in setup.py +# List *all* library dependencies and extras in this file. +# Pin the version to the lower bound. +# +# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", +# Then this file should have foo==1.14.0 +google-api-core==1.26.0 +google-cloud-core==1.4.1 +grpc-google-iam-v1==0.12.3 +libcst==0.2.5 +proto-plus==1.13.0 +sqlparse==0.3.0 +opentelemetry-api==1.1.0 +opentelemetry-sdk==1.1.0 +opentelemetry-instrumentation==0.20b0 +packaging==14.3 diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt index e69de29bb2..2eac9c8653 100644 --- a/testing/constraints-3.9.txt +++ b/testing/constraints-3.9.txt @@ -0,0 +1,17 @@ +# This constraints file is used to check that lower bounds +# are correct in setup.py +# List *all* library dependencies and extras in this file. +# Pin the version to the lower bound. +# +# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", +# Then this file should have foo==1.14.0 +google-api-core==1.26.0 +google-cloud-core==1.4.1 +grpc-google-iam-v1==0.12.3 +libcst==0.2.5 +proto-plus==1.13.0 +sqlparse==0.3.0 +opentelemetry-api==1.1.0 +opentelemetry-sdk==1.1.0 +opentelemetry-instrumentation==0.20b0 +packaging==14.3 From 8bb63fd8d5bb90139535205e6764fe1d17f76b7d Mon Sep 17 00:00:00 2001 From: larkee Date: Wed, 28 Jul 2021 12:11:26 +1000 Subject: [PATCH 3/4] test: revert test constraints --- testing/constraints-3.10.txt | 17 ----------------- testing/constraints-3.11.txt | 17 ----------------- testing/constraints-3.7.txt | 17 ----------------- testing/constraints-3.8.txt | 17 ----------------- testing/constraints-3.9.txt | 17 ----------------- 5 files changed, 85 deletions(-) diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt index 2eac9c8653..e69de29bb2 100644 --- a/testing/constraints-3.10.txt +++ b/testing/constraints-3.10.txt @@ -1,17 +0,0 @@ -# This constraints file is used to check that lower bounds -# are correct in setup.py -# List *all* library dependencies and extras in this file. -# Pin the version to the lower bound. -# -# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", -# Then this file should have foo==1.14.0 -google-api-core==1.26.0 -google-cloud-core==1.4.1 -grpc-google-iam-v1==0.12.3 -libcst==0.2.5 -proto-plus==1.13.0 -sqlparse==0.3.0 -opentelemetry-api==1.1.0 -opentelemetry-sdk==1.1.0 -opentelemetry-instrumentation==0.20b0 -packaging==14.3 diff --git a/testing/constraints-3.11.txt b/testing/constraints-3.11.txt index 2eac9c8653..e69de29bb2 100644 --- a/testing/constraints-3.11.txt +++ b/testing/constraints-3.11.txt @@ -1,17 +0,0 @@ -# This constraints file is used to check that lower bounds -# are correct in setup.py -# List *all* library dependencies and extras in this file. -# Pin the version to the lower bound. -# -# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", -# Then this file should have foo==1.14.0 -google-api-core==1.26.0 -google-cloud-core==1.4.1 -grpc-google-iam-v1==0.12.3 -libcst==0.2.5 -proto-plus==1.13.0 -sqlparse==0.3.0 -opentelemetry-api==1.1.0 -opentelemetry-sdk==1.1.0 -opentelemetry-instrumentation==0.20b0 -packaging==14.3 diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 2eac9c8653..e69de29bb2 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -1,17 +0,0 @@ -# This constraints file is used to check that lower bounds -# are correct in setup.py -# List *all* library dependencies and extras in this file. -# Pin the version to the lower bound. -# -# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", -# Then this file should have foo==1.14.0 -google-api-core==1.26.0 -google-cloud-core==1.4.1 -grpc-google-iam-v1==0.12.3 -libcst==0.2.5 -proto-plus==1.13.0 -sqlparse==0.3.0 -opentelemetry-api==1.1.0 -opentelemetry-sdk==1.1.0 -opentelemetry-instrumentation==0.20b0 -packaging==14.3 diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt index 2eac9c8653..e69de29bb2 100644 --- a/testing/constraints-3.8.txt +++ b/testing/constraints-3.8.txt @@ -1,17 +0,0 @@ -# This constraints file is used to check that lower bounds -# are correct in setup.py -# List *all* library dependencies and extras in this file. -# Pin the version to the lower bound. -# -# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", -# Then this file should have foo==1.14.0 -google-api-core==1.26.0 -google-cloud-core==1.4.1 -grpc-google-iam-v1==0.12.3 -libcst==0.2.5 -proto-plus==1.13.0 -sqlparse==0.3.0 -opentelemetry-api==1.1.0 -opentelemetry-sdk==1.1.0 -opentelemetry-instrumentation==0.20b0 -packaging==14.3 diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt index 2eac9c8653..e69de29bb2 100644 --- a/testing/constraints-3.9.txt +++ b/testing/constraints-3.9.txt @@ -1,17 +0,0 @@ -# This constraints file is used to check that lower bounds -# are correct in setup.py -# List *all* library dependencies and extras in this file. -# Pin the version to the lower bound. -# -# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev", -# Then this file should have foo==1.14.0 -google-api-core==1.26.0 -google-cloud-core==1.4.1 -grpc-google-iam-v1==0.12.3 -libcst==0.2.5 -proto-plus==1.13.0 -sqlparse==0.3.0 -opentelemetry-api==1.1.0 -opentelemetry-sdk==1.1.0 -opentelemetry-instrumentation==0.20b0 -packaging==14.3 From 4671eb803d9662db867cc98fed7cc162db792fc6 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Wed, 28 Jul 2021 15:30:29 -0400 Subject: [PATCH 4/4] chore: pin `opentelemetry-instrumentation < 0.23dev` Versions after `0.23b0` are now released, and still break us. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ac49a7131a..1e17682530 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ "tracing": [ "opentelemetry-api >= 1.1.0", "opentelemetry-sdk >= 1.1.0", - "opentelemetry-instrumentation >= 0.20b0, != 0.23b0", + "opentelemetry-instrumentation >= 0.20b0, < 0.23dev", ], "libcst": "libcst >= 0.2.5", }