Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
merge upstream changes to coralogix-python-dev (#6)
* Add otelTraceSampled to instrumetation-logging (open-telemetry#1773) * Add otelTraceSampled to instrumetation-logging * Updated code with black * Added to CHANGELOG.md --------- Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> * Expand sqlalchemy pool.name to follow the semantic conventions (open-telemetry#1778) * Skip requests tests for pypy3 (open-telemetry#1806) * Update version to 1.19.0.dev/0.40b0.dev (open-telemetry#1797) Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> * Resource detector for container properties (open-telemetry#1584) Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> Co-authored-by: Leighton Chen <lechen@microsoft.com> * botocore: always use x-ray for http header injection (open-telemetry#1741) Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Refactor CODEOWNERS file (open-telemetry#1804) * Refactor CODEOWNERS file Fixes open-telemetry#1803 * Remove CODEOWNERS * Refactor component owners configuration * Refactor CODEOWNERS to select any file but the ones in instrumentation --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Update maintainers list (open-telemetry#1817) * skip urllib3 test on pypy3 (open-telemetry#1826) * Fix celery docker tests (open-telemetry#1841) * Use HTTP mock server for aiohttp tests (open-telemetry#1849) Fixes open-telemetry#1842 * Use HTTP mock server for tornado tests (open-telemetry#1855) * Use HTTP mock server for tornado tests Fixes open-telemetry#1681 * Fix lint * Remove use of httpbin (open-telemetry#1854) * Use `request_ctx` to determine whether or not `_teardown_request` should end flask span (open-telemetry#1692) Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * remove srikanthccv from maintainers (open-telemetry#1792) Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Sanitize redis db_statement by default (open-telemetry#1776) Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Relax httpx version to allow >= 0.18.0 (open-telemetry#1748) * Issue open-telemetry#1757 - Update HTTP server/client instrumentation span names (open-telemetry#1759) Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> * Fix falcon usage of Span Status (open-telemetry#1840) * Fix falcon usage of Span Status to only set the description if the status code is ERROR * Update changelog * Update CHANGELOG.md Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> * fix lint * Use fewer variables to satisfy R0914 lint rule --------- Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> * Request Flask attributes passed to Sampler (open-telemetry#1784) * Request Flask attributes passed to Sampler * Update changelog * Lint * Fix botocore test keyerror * Revert "Fix botocore test keyerror" This reverts commit fd03c55. * botocore test does get_queue_url * Revert "botocore test does get_queue_url" This reverts commit 9530cd2. * Update changelog --------- Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Fixed urllib3 instrumentation example in instrumentation documentation (open-telemetry#1793) * corrected instrumentation example in urllib3 * Remove changelog entry --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Fix Invalid type NoneType for attribute X error | AWS-Lambda instrumentation (open-telemetry#1785) * Add None checking to the aws-lambda logic * Update changelog. * Change .get() check to 'key' in dict check. * Fix consistency issues. * Update changelog. --------- Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Add metrics instrumentation celery (open-telemetry#1679) Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Add support for confluent_kafka until 2.1.1 version (open-telemetry#1815) * Add support for confulent_kafka until 2.1.1 version * Include 2.1.1 version * update CHANGELOG.md * run: 'tox -e generate' * resolve comments * update top version to 2.2.0 --------- Co-authored-by: Ran Nozik <ran@gethelios.dev> * fix redis doc (open-telemetry#1808) doc string rendered at https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/redis/redis.html refers to `opentelemetry-instrumentation` executable which appears to be a typo Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Add http.server.response.size metric to ASGI implementation. (open-telemetry#1789) * Add http.server.response.size metric to ASGI implementation. Add new unit tests. * Update changelog. * Fix linting by disabling too-many-nested-blocks * Put new logic in a new method * Refactor the placement of new logic. * Fixed the unit tests in FastAPI and Starlette * Update changelog. * FIx lint errors. * Refactor getting content-length header * Refactor getting content-length header --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * fix: Update falcon instrumentation to follow semantic conventions (open-telemetry#1824) * fix: Update falcon instrumentation to follow semantic conventions * docs: Update changelog * fix linter errors * Disable falcon.HTTP_200 pylint checck --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> * Bump requests from 2.28.1 to 2.31.0 (open-telemetry#1818) Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.31.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](psf/requests@v2.28.1...v2.31.0) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * fix(grpc): Allow gRPC connections via Unix socket (open-telemetry#1833) * fix(grpc): Allow gRPC connections via Unix socket This commit addresses issue open-telemetry#1832. The way `NET_PEER_IP` and `NET_PEER_PORT` are retrieved raises a `ValueError` when gRPC connections are handled via Unix sockets. ```py ip, port = ( context.peer().split(",")[0].split(":", 1)[1].rsplit(":", 1) ) ``` When using an address like `unix:///tmp/grpc.sock` the value of `context.peer()` is `"unix:"`. Substituting that in the function above... ```py ip, port = "unix:".split(",")[0].split(":", 1)[1].rsplit(":", 1) ip, port = ["unix:"][0].split(":", 1)[1].rsplit(":", 1) ip, port = "unix:".split(":", 1)[1].rsplit(":", 1) ip, port = ["unix", ""][1].rsplit(":", 1) ip, port = "".rsplit(":", 1) ip, port = [""] # ValueError ``` I "addressed" the issue by guarding the retrieval of `net.peer.*` values under an `if` statement that checks if we are using a Unix socket. I extended the `server_interceptor` tests to run against TCP and Unix socket configurations. --- **Open Questions** - [ ] The socket tests will fail on Windows. Is there a way to annotate that? - [ ] Are there other span values we should be setting for the unix socket? * Update CHANGELOG * Add placeholder attributes for linter * fix lint --------- Co-authored-by: Matt Oberle <mattoberle@users.noreply.github.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Add http.server.request.size for ASGI metric implementation (open-telemetry#1867) * Update changelog file. * Update changelog file. * Add new request.size metric for ASGI middleware. * Clean-up. * Refactor try except section. --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Fix elastic-search sanitization for bulk queries (open-telemetry#1870) * support sanitization for str body response * add CHANGELOG entry --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Add conditional elastic_transport import (open-telemetry#1810) * Add conditional elastic_transport import * Update changelog * Add future es8 tests * Update CHANGELOG.md Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Add license, rm pylint disable * Consistent elastic version check * lint import * Update CHANGELOG.md --------- Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Fix async redis clients tracing (open-telemetry#1830) * Fix async redis clients tracing * Update changelog * Add functional integration tests and fix linting issues --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Update maintainers list (open-telemetry#1874) * Use a weak reference to sqlalchemy Engine to avoid memory leak (open-telemetry#1771) * Use a weak reference to sqlalchemy Engine to avoid memory leak Closes open-telemetry#1761 By using a weak reference to the `Engine` object, we can avoid the memory leak as disposed `Engines` get properly deallocated. Whenever `SQLAlchemy` is uninstrumented, we only trigger a removal for those event listeners which are listening for objects that haven't been garbage-collected yet. * Made a mistake in resolving the weak reference * Fixed formatting issues * Updated changelog * Added unit test to check that engine was garbage collected * Do not save engine in EngineTracer to avoid memory leak * Add an empty line to satisfy black formatter * Fix isort complaints * Fixed the issue when pool name is not set and =None * Fix formatting issue * Rebased after changes in a recent commit * Updated PR number in changelog --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * sqlalchemy wrap_create_engine now accepts sqlcommenter options (open-telemetry#1873) * sqlalchemy wrap_create_engine accepts sqlcommenter options * Changelog * Lint * Fix default val * Add sqlalchemy tests * Change a default in _instrument get * Lint * More lint * Update default Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Update args doc * lintttt --------- Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Add statement of maintainership (open-telemetry#1859) Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * urllib3: Add instrumentation support for version 2 (open-telemetry#1879) * urllib3: Add instrumentation support for version 2 * changelog * Distro selection (open-telemetry#1823) * fix(django): avoid empty span name on empty path (open-telemetry#1788) Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Instrument mysqlclient library (open-telemetry#1744) Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Update version to 1.20.0.dev/0.41b0.dev (open-telemetry#1885) Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Fix pyyaml version (open-telemetry#1892) * update awslambda to use _X_AMZN_TRACE_ID as a Span Link (open-telemetry#1657) Co-authored-by: Ron Yishai <ronyish@cisco.com> Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Fix UnboundLocalError local variable 'start' referenced before assignment (open-telemetry#1889) Co-authored-by: Pablo Collins <pablo.collins@gmail.com> * Merge pull request from GHSA-5rv5-6h4r-h22v * Fix unbound cardinality for label http_method in wsgi based middlewares * cr: rename file * cr: change label UNKNOWN to NONSTANDARD * Update instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py --------- Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Fix errors introduced in regression (open-telemetry#1913) * Azure resource detectors (open-telemetry#1901) * Revert "update awslambda to use _X_AMZN_TRACE_ID as a Span Link" (open-telemetry#1911) Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * feat(confluent-kafka): Add instrumentation to consume method (open-telemetry#1786) Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Add Cassandra instrumentation (open-telemetry#1902) * Unwrap Celery's `ExceptionInfo` (open-telemetry#1863) * Unwrap `ExceptionInfo` and `ExceptionWithTraceback` Instead of reporting the `ExceptionInfo` and `ExceptionWithTraceback` wrappers raised by Celery, report the exceptions that they wrap. This ensures that the exception in the OpenTelemetry span has a type and traceback that are meaningful and relevant to the developer. * Fix typo The exception is expected, not excepted. Well, I guess it is also excepted, because it's an exception, but you get what I mean. * Reformat file with `black` Reformat the `__init__.py` file in the Celery instrumentation using `black`, fixing a CI linter error. * Address review feedback Use the VERSION attribute exposed by Billiard to decide whether to import ExceptionWithTraceback. Add a test for a failing task and check that the exceptions' type and message are preserved. * Amend ExceptionWithTraceback import * doc: fix `commenter_options` type (open-telemetry#1926) Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> * Update version to 1.21.0.dev/0.42b0.dev (open-telemetry#1930) Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> * Modify eachdist and build script for container packages (open-telemetry#1949) * Update pyproject.toml (open-telemetry#1950) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Nahian-Al Hasan <nahian97@gmail.com> Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com> Co-authored-by: Shalev Roda <65566801+shalevr@users.noreply.github.com> Co-authored-by: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Diego Hurtado <ocelotl@users.noreply.github.com> Co-authored-by: Sanket Mehta <sankmeht@cisco.com> Co-authored-by: Leighton Chen <lechen@microsoft.com> Co-authored-by: Tristan Sloughter <t@crashfast.com> Co-authored-by: Matthew Grossman <matt@mrgrossman.com> Co-authored-by: Nimrod Shlagman <nemos@cisco.com> Co-authored-by: Phillip Verheyden <pverheyden@gmail.com> Co-authored-by: Maciej Nachtygal <82878433+macieyng@users.noreply.github.com> Co-authored-by: Filip Nikolovski <me@filipnikolovski.com> Co-authored-by: Tammy Baylis <96076570+tammy-baylis-swi@users.noreply.github.com> Co-authored-by: Yashaswi Makula <yashaswi.makula@gmail.com> Co-authored-by: Iman Shafiei <imanshafiei540@gmail.com> Co-authored-by: Akochavi <121871419+Akochavi@users.noreply.github.com> Co-authored-by: David Gonoradsky <david@gethelios.dev> Co-authored-by: Ran Nozik <ran@gethelios.dev> Co-authored-by: Pablo Collins <pablo.collins@gmail.com> Co-authored-by: Iman Shafiei <iman.shafiei@earthdaily.com> Co-authored-by: Michael <mshebeko@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matt Oberle <matt.r.oberle@gmail.com> Co-authored-by: Matt Oberle <mattoberle@users.noreply.github.com> Co-authored-by: Vivanov98 <66319645+Vivanov98@users.noreply.github.com> Co-authored-by: Rytis Bagdziunas <rbagd@users.noreply.github.com> Co-authored-by: Mario Jonke <mario.jonke@dynatrace.com> Co-authored-by: Jeremy Voss <jerevoss@gmail.com> Co-authored-by: Marc Dougherty <muncus@users.noreply.github.com> Co-authored-by: Alexandre Papin <alexandre.papin@indaclouds.fr> Co-authored-by: Ron Yishai <ronyish@cisco.com> Co-authored-by: Thomas LÉVEIL <thomasleveil@users.noreply.github.com> Co-authored-by: Jakub Warczarek <jakub.warczarek@gmail.com> Co-authored-by: Raphael Philipe Mendes da Silva <rapphil@gmail.com> Co-authored-by: Javier Fernández Rodríguez <rfjgoo@gmail.com> Co-authored-by: mattcontinisio <mrcontinisio@gmail.com> Co-authored-by: Noemi <45180344+unflxw@users.noreply.github.com> Co-authored-by: João Thallis <joaothallis@icloud.com>
- Loading branch information
40 people
committed
Sep 28, 2023
1 parent
dc1cc5e
commit df8a761