diff --git a/instrumentation/opentelemetry-instrumentation-asgi/Makefile b/instrumentation/opentelemetry-instrumentation-asgi/Makefile new file mode 100644 index 0000000000..0851d8349d --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-asgi/Makefile @@ -0,0 +1,15 @@ +SHELL=bash + +.DEFAULT_GOAL := nothing + +nothing: + @echo -e "Welcome! Options:" + @echo -e " - 'make package':" + @echo -e " Build the agent package distribution (sdist and bdist)." + +package: + @rm -rf ./dist + @python3.8 -m build --outdir ./dist + +clean: + @rm -rf dist/ diff --git a/instrumentation/opentelemetry-instrumentation-asgi/README.rst b/instrumentation/opentelemetry-instrumentation-asgi/README.rst index 5abd88a161..c48149b50b 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/README.rst +++ b/instrumentation/opentelemetry-instrumentation-asgi/README.rst @@ -10,12 +10,18 @@ OpenTelemetry ASGI Instrumentation This library provides a ASGI middleware that can be used on any ASGI framework (such as Django, Starlette, FastAPI or Quart) to track requests timing through OpenTelemetry. +About this +------------ + +This is a fork of ``opentelemetry-instrumentation-asgi`` that uses custom ``sw-apm-opentelemetry-instrumentation``. + + Installation ------------ :: - pip install opentelemetry-instrumentation-asgi + pip install sw-apm-opentelemetry-instrumentation-asgi References ---------- diff --git a/instrumentation/opentelemetry-instrumentation-asgi/docker-compose.yml b/instrumentation/opentelemetry-instrumentation-asgi/docker-compose.yml new file mode 100644 index 0000000000..9724f4a798 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-asgi/docker-compose.yml @@ -0,0 +1,44 @@ +version: '2.4' + +services: + x86_64: + image: quay.io/pypa/manylinux_2_28_x86_64 + user: root + stdin_open: true + tty: true + network_mode: host + cap_add: + - ALL + volumes: + - ./:/code + working_dir: /code + entrypoint: ["/bin/bash", "-c"] + command: + - | + # boto3 for interaction with AWS + # twine to upload to TestPyPi + # tox for automated tests + python3.8 -m pip install --upgrade pip + python3.8 -m pip install boto3 twine tox + /bin/bash + + aarch64: + image: quay.io/pypa/manylinux_2_28_aarch64 + user: root + stdin_open: true + tty: true + network_mode: host + cap_add: + - ALL + volumes: + - ./:/code + working_dir: /code + entrypoint: ["/bin/bash", "-c"] + command: + - | + # boto3 for interaction with AWS + # twine to upload to TestPyPi + # tox for automated tests + python3.8 -m pip install --upgrade pip + python3.8 -m pip install boto3 twine tox + /bin/bash diff --git a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml index a4072bac7d..3aa3e58fa3 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml @@ -3,9 +3,9 @@ requires = ["hatchling"] build-backend = "hatchling.build" [project] -name = "opentelemetry-instrumentation-asgi" +name = "sw-apm-opentelemetry-instrumentation-asgi" dynamic = ["version"] -description = "ASGI instrumentation for OpenTelemetry" +description = "Fork of ASGI instrumentation for OpenTelemetry" readme = "README.rst" license = "Apache-2.0" requires-python = ">=3.8" @@ -26,9 +26,9 @@ classifiers = [ dependencies = [ "asgiref ~= 3.0", "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.46b0.dev", - "opentelemetry-semantic-conventions == 0.46b0.dev", - "opentelemetry-util-http == 0.46b0.dev", + "sw-apm-opentelemetry-instrumentation == 0.45b0", + "opentelemetry-semantic-conventions == 0.45b0", + "opentelemetry-util-http == 0.45b0", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py index ff4933b20b..6deb7c3d9e 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py +++ b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.46b0.dev" +__version__ = "0.45b0" diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/Makefile b/instrumentation/opentelemetry-instrumentation-dbapi/Makefile new file mode 100644 index 0000000000..0851d8349d --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-dbapi/Makefile @@ -0,0 +1,15 @@ +SHELL=bash + +.DEFAULT_GOAL := nothing + +nothing: + @echo -e "Welcome! Options:" + @echo -e " - 'make package':" + @echo -e " Build the agent package distribution (sdist and bdist)." + +package: + @rm -rf ./dist + @python3.8 -m build --outdir ./dist + +clean: + @rm -rf dist/ diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/README.rst b/instrumentation/opentelemetry-instrumentation-dbapi/README.rst index c232fe602d..2ce18fe37f 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/README.rst +++ b/instrumentation/opentelemetry-instrumentation-dbapi/README.rst @@ -6,12 +6,18 @@ OpenTelemetry Database API instrumentation .. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-dbapi.svg :target: https://pypi.org/project/opentelemetry-instrumentation-dbapi/ +About this +------------ + +This is a fork of ``opentelemetry-instrumentation-dbapi`` that uses custom ``sw-apm-opentelemetry-instrumentation``. + + Installation ------------ :: - pip install opentelemetry-instrumentation-dbapi + pip install sw-apm-opentelemetry-instrumentation-dbapi References diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/docker-compose.yml b/instrumentation/opentelemetry-instrumentation-dbapi/docker-compose.yml new file mode 100644 index 0000000000..9724f4a798 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-dbapi/docker-compose.yml @@ -0,0 +1,44 @@ +version: '2.4' + +services: + x86_64: + image: quay.io/pypa/manylinux_2_28_x86_64 + user: root + stdin_open: true + tty: true + network_mode: host + cap_add: + - ALL + volumes: + - ./:/code + working_dir: /code + entrypoint: ["/bin/bash", "-c"] + command: + - | + # boto3 for interaction with AWS + # twine to upload to TestPyPi + # tox for automated tests + python3.8 -m pip install --upgrade pip + python3.8 -m pip install boto3 twine tox + /bin/bash + + aarch64: + image: quay.io/pypa/manylinux_2_28_aarch64 + user: root + stdin_open: true + tty: true + network_mode: host + cap_add: + - ALL + volumes: + - ./:/code + working_dir: /code + entrypoint: ["/bin/bash", "-c"] + command: + - | + # boto3 for interaction with AWS + # twine to upload to TestPyPi + # tox for automated tests + python3.8 -m pip install --upgrade pip + python3.8 -m pip install boto3 twine tox + /bin/bash diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml index e726768535..abf23c69d6 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml @@ -3,9 +3,9 @@ requires = ["hatchling"] build-backend = "hatchling.build" [project] -name = "opentelemetry-instrumentation-dbapi" +name = "sw-apm-opentelemetry-instrumentation-dbapi" dynamic = ["version"] -description = "OpenTelemetry Database API instrumentation" +description = "Fork of OpenTelemetry Database API instrumentation" readme = "README.rst" license = "Apache-2.0" requires-python = ">=3.8" @@ -25,8 +25,8 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.46b0.dev", - "opentelemetry-semantic-conventions == 0.46b0.dev", + "sw-apm-opentelemetry-instrumentation == 0.45b0", + "opentelemetry-semantic-conventions == 0.45b0", "wrapt >= 1.0.0, < 2.0.0", ] diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py index 17627b21dc..40576e3ded 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py +++ b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.46b0.dev" +__version__ = "0.45b0" _instruments = tuple() diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/Makefile b/instrumentation/opentelemetry-instrumentation-wsgi/Makefile new file mode 100644 index 0000000000..0851d8349d --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-wsgi/Makefile @@ -0,0 +1,15 @@ +SHELL=bash + +.DEFAULT_GOAL := nothing + +nothing: + @echo -e "Welcome! Options:" + @echo -e " - 'make package':" + @echo -e " Build the agent package distribution (sdist and bdist)." + +package: + @rm -rf ./dist + @python3.8 -m build --outdir ./dist + +clean: + @rm -rf dist/ diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/README.rst b/instrumentation/opentelemetry-instrumentation-wsgi/README.rst index 5aa28e89bd..3e262fd1ee 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/README.rst +++ b/instrumentation/opentelemetry-instrumentation-wsgi/README.rst @@ -10,12 +10,19 @@ OpenTelemetry WSGI Middleware This library provides a WSGI middleware that can be used on any WSGI framework (such as Django / Flask) to track requests timing through OpenTelemetry. + +About this +------------ + +This is a fork of ``opentelemetry-instrumentation-wsgi`` that uses custom ``sw-apm-opentelemetry-instrumentation``. + + Installation ------------ :: - pip install opentelemetry-instrumentation-wsgi + pip install sw-apm-opentelemetry-instrumentation-wsgi References ---------- diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/docker-compose.yml b/instrumentation/opentelemetry-instrumentation-wsgi/docker-compose.yml new file mode 100644 index 0000000000..9724f4a798 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-wsgi/docker-compose.yml @@ -0,0 +1,44 @@ +version: '2.4' + +services: + x86_64: + image: quay.io/pypa/manylinux_2_28_x86_64 + user: root + stdin_open: true + tty: true + network_mode: host + cap_add: + - ALL + volumes: + - ./:/code + working_dir: /code + entrypoint: ["/bin/bash", "-c"] + command: + - | + # boto3 for interaction with AWS + # twine to upload to TestPyPi + # tox for automated tests + python3.8 -m pip install --upgrade pip + python3.8 -m pip install boto3 twine tox + /bin/bash + + aarch64: + image: quay.io/pypa/manylinux_2_28_aarch64 + user: root + stdin_open: true + tty: true + network_mode: host + cap_add: + - ALL + volumes: + - ./:/code + working_dir: /code + entrypoint: ["/bin/bash", "-c"] + command: + - | + # boto3 for interaction with AWS + # twine to upload to TestPyPi + # tox for automated tests + python3.8 -m pip install --upgrade pip + python3.8 -m pip install boto3 twine tox + /bin/bash diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml b/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml index e3e8bca651..8ee0b176d2 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-wsgi/pyproject.toml @@ -3,9 +3,9 @@ requires = ["hatchling"] build-backend = "hatchling.build" [project] -name = "opentelemetry-instrumentation-wsgi" +name = "sw-apm-opentelemetry-instrumentation-wsgi" dynamic = ["version"] -description = "WSGI Middleware for OpenTelemetry" +description = "Fork of WSGI Middleware for OpenTelemetry" readme = "README.rst" license = "Apache-2.0" requires-python = ">=3.8" @@ -25,9 +25,9 @@ classifiers = [ ] dependencies = [ "opentelemetry-api ~= 1.12", - "opentelemetry-instrumentation == 0.46b0.dev", - "opentelemetry-semantic-conventions == 0.46b0.dev", - "opentelemetry-util-http == 0.46b0.dev", + "sw-apm-opentelemetry-instrumentation == 0.45b0", + "opentelemetry-semantic-conventions == 0.45b0", + "opentelemetry-util-http == 0.45b0", ] [project.optional-dependencies] diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py index ff4933b20b..6deb7c3d9e 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py +++ b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.46b0.dev" +__version__ = "0.45b0"