Merge branch 'main' of https://github.com/open-telemetry/opentelemetry-python-contrib

Author: lzchen

CHANGELOG.md

@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.3.0-0.22b0...HEAD)
+- Include Flask 2.0 as compatible with existing flask instrumentation
+  ([#545](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/545))
 
 ### Changed
 - `opentelemetry-instrumentation-tornado` properly instrument work done in tornado on_finish method.
@@ -17,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#469](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/469))
 - Implemented specification that HTTP span attributes must not contain username and password.
   ([#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))
 
 ### Added
 - `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation

CONTRIBUTING.md

@@ -153,6 +153,21 @@ rather than conform to specific API names or argument patterns in the spec.
 
 For a deeper discussion, see: https://github.com/open-telemetry/opentelemetry-specification/issues/165
 
+## Running Tests Locally
+
+1. Go to your Contrib repo directory. `git clone [email protected]:open-telemetry/opentelemetry-python-contrib.git && cd opentelemetry-python-contrib`.
+2. Clone the [OpenTelemetry Python](https://github.com/open-telemetry/opentelemetry-python) Python Core repo to a folder named `opentelemetry-python-core`. `git clone https://github.com/open-telemetry/opentelemetry-python.git opentelemetry-python-core`.
+3. Make sure you have `tox` installed. `pip install tox`.
+4. Run `tox` without any arguments to run tests for all the packages. Read more about [tox](https://tox.readthedocs.io/en/latest/).
+
+### Testing against a different Core repo branch/commit
+
+1. Change directory to the repo that was cloned above. `cd opentelemetry-python-core`.
+2. Move the head of this repo to the SHA hash you want your tests to use. The current SHA hash can be found in `.github/workflows/test.yml` file under the `opentelemetry-python-contrib` directory. For example, currently it is `1a12fa0d681e37c1fda9cb8d46212ff3bbf6b76a`. So use `git fetch && git checkout <current SHA hash>`.
+3. Go back to the root directory. `cd ../`.
+4. With `tox` installed, run tests for a package. (e.g. `tox -e test-instrumentation-flask`.)
+
+
 ## Style Guide
 
 * docstrings should adhere to the [Google Python Style

instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/package.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("flask ~= 1.0",)
+_instruments = ("flask >= 1.0, < 3.0",)

instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/package.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = ("psycopg2-binary >= 2.7.3.1",)
+_instruments = ("psycopg2 >= 2.7.3.1",)

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -61,7 +61,7 @@
         "instrumentation": "opentelemetry-instrumentation-fastapi==0.23.dev0",
     },
     "flask": {
-        "library": "flask ~= 1.0",
+        "library": "flask >= 1.0, < 3.0",
         "instrumentation": "opentelemetry-instrumentation-flask==0.23.dev0",
     },
     "grpcio": {
@@ -80,8 +80,8 @@
         "library": "mysql-connector-python ~= 8.0",
         "instrumentation": "opentelemetry-instrumentation-mysql==0.23.dev0",
     },
-    "psycopg2-binary": {
-        "library": "psycopg2-binary >= 2.7.3.1",
+    "psycopg2": {
+        "library": "psycopg2 >= 2.7.3.1",
         "instrumentation": "opentelemetry-instrumentation-psycopg2==0.23.dev0",
     },
     "pymemcache": {

tox.ini

@@ -403,7 +403,7 @@ deps =
   mysql-connector-python ~=  8.0
   pymongo ~= 3.1
   PyMySQL ~= 0.10.1
-  psycopg2-binary ~= 2.8.4
+  psycopg2 ~= 2.8.4
   aiopg >= 0.13.0
   sqlalchemy ~= 1.3.16
   redis ~= 3.3.11