Skip to content

Commit

Permalink
Forked asgi,wsgi,dbapi instrumentors
Browse files Browse the repository at this point in the history
  • Loading branch information
tammy-baylis-swi committed May 2, 2024
1 parent 9628c03 commit bd071fb
Show file tree
Hide file tree
Showing 15 changed files with 216 additions and 20 deletions.
15 changes: 15 additions & 0 deletions instrumentation/opentelemetry-instrumentation-asgi/Makefile
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
15 changes: 15 additions & 0 deletions instrumentation/opentelemetry-instrumentation-dbapi/Makefile
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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",
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
15 changes: 15 additions & 0 deletions instrumentation/opentelemetry-instrumentation-wsgi/Makefile
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
Expand Up @@ -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
----------
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit bd071fb

Please sign in to comment.