Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require aiopg to be less than 1.3.0 #560

Merged
merged 3 commits into from
Jul 1, 2021
Merged

Require aiopg to be less than 1.3.0 #560

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c58a89a
Require aiopg to be less than 1.3.0
RyanSiu1995 Jul 1, 2021
62e3cf2
Add the CHANGELOG
RyanSiu1995 Jul 1, 2021
53ba615
Combine the old dependency
RyanSiu1995 Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/538))
- Changed the psycopg2-binary to psycopg2 as dependency in production
([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543))
- Require aiopg to be less than 1.3.0
([#560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/560))

### Added
- `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation
Expand Down
2 changes: 1 addition & 1 deletion docs-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ django>=2.2

# Required by instrumentation and exporter packages
aiohttp~=3.0
aiopg>=0.13.0
aiopg<=1.2.1
asyncpg>=0.12.0
boto~=2.0
botocore~=1.0
Expand Down
2 changes: 1 addition & 1 deletion ...on/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# limitations under the License.


_instruments = ("aiopg >= 0.13.0",)
_instruments = ("aiopg <= 1.2.1",)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be >=0.13.0, <1.3.0 consider 1.3 introduced the breaking change and for some reason we did not want to support versions older than 0.13?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't aware of the support of multiple conditions in python.
I have updated accordingly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Can you please open an issue that tracks adding support for 1.3.0 and newer versions? Please also include details about the issue this instrumentation has today.

Copy link
Contributor Author

@RyanSiu1995 RyanSiu1995 Jul 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created as #561

2 changes: 1 addition & 1 deletion opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.23.dev0",
},
"aiopg": {
"library": "aiopg >= 0.13.0",
"library": "aiopg <= 1.2.1",
"instrumentation": "opentelemetry-instrumentation-aiopg==0.23.dev0",
},
"asgiref": {
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ deps =
pymongo ~= 3.1
PyMySQL ~= 0.10.1
psycopg2 ~= 2.8.4
aiopg >= 0.13.0
aiopg <= 1.2.1
sqlalchemy ~= 1.3.16
redis ~= 3.3.11
celery[pytest] >= 4.0, < 6.0
Expand Down