Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bad6b36

Browse files
Thiyagu55Thiyagu55
authoredMar 17, 2022
Merge branch 'open-telemetry:main' into sqlcommenter-psycopg2-integration-v2
2 parents c296197 + 2f74c90 commit bad6b36

File tree

11 files changed

+438
-0
lines changed

11 files changed

+438
-0
lines changed
 

Diff for: ‎CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3030
- `opentelemetry-instrumentation-aws-lambda` `SpanKind.SERVER` by default, add more cases for `SpanKind.CONSUMER` services. ([#926](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/926))
3131
- `opentelemetry-instrumentation-sqlalchemy` added experimental sql commenter capability
3232
([#924](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/924))
33+
- `opentelemetry-contrib-instrumentations` added new meta-package that installs all contrib instrumentations.
34+
([#681](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/681))
3335
- `opentelemetry-instrumentation-dbapi` add experimental sql commenter capability
3436
([#908](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/908))
3537
- `opentelemetry-instrumentation-requests` make span attribute available to samplers

Diff for: ‎docs-requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,7 @@ sqlalchemy>=1.0
3737
tornado>=5.1.1
3838
ddtrace>=0.34.0
3939
httpx>=0.18.0
40+
41+
# indirect dependency pins
4042
markupsafe==2.0.1
4143
itsdangerous==2.0.1

Diff for: ‎eachdist.ini

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ packages=
4141
opentelemetry-semantic-conventions
4242
opentelemetry-test-utils
4343
opentelemetry-instrumentation
44+
opentelemetry-contrib-instrumentations
4445
opentelemetry-distro
4546

4647
[exclude_release]

Diff for: ‎opentelemetry-contrib-instrumentations/LICENSE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright The OpenTelemetry Authors
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

Diff for: ‎opentelemetry-contrib-instrumentations/MANIFEST.in

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
graft src
2+
graft tests
3+
global-exclude *.pyc
4+
global-exclude *.pyo
5+
global-exclude __pycache__/*
6+
include MANIFEST.in
7+
include README.rst
8+
include LICENSE

Diff for: ‎opentelemetry-contrib-instrumentations/README.rst

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
OpenTelemetry Instrumentation
2+
=============================
3+
4+
|pypi|
5+
6+
.. |pypi| image:: https://badge.fury.io/py/opentelemetry-contrib-instrumentations.svg
7+
:target: https://pypi.org/project/opentelemetry-contrib-instrumentations/
8+
9+
Installation
10+
------------
11+
12+
::
13+
14+
pip install opentelemetry-contrib-instrumentations
15+
16+
17+
This package installs all instrumentation packages hosted by the OpenTelemetry Python Coontrib repository.
18+
The list of packages can be found (here)[https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation]
19+
20+
21+
References
22+
----------
23+
24+
* `OpenTelemetry Project <https://opentelemetry.io/>`_

Diff for: ‎opentelemetry-contrib-instrumentations/setup.cfg

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
[metadata]
2+
name = opentelemetry-contrib-instrumentations
3+
description = OpenTelemetry Contrib Instrumentation Packages
4+
long_description = file: README.rst
5+
long_description_content_type = text/x-rst
6+
author = OpenTelemetry Authors
7+
author_email = cncf-opentelemetry-contributors@lists.cncf.io
8+
url = https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-contrib-instrumentations
9+
platforms = any
10+
license = Apache-2.0
11+
classifiers =
12+
Development Status :: 4 - Beta
13+
Intended Audience :: Developers
14+
License :: OSI Approved :: Apache Software License
15+
Programming Language :: Python
16+
Programming Language :: Python :: 3
17+
Programming Language :: Python :: 3.6
18+
Programming Language :: Python :: 3.7
19+
Programming Language :: Python :: 3.8
20+
Programming Language :: Python :: 3.9
21+
Programming Language :: Python :: 3.10
22+
23+
[options]
24+
python_requires = >=3.6
25+
package_dir =
26+
=src
27+
packages = find_namespace:
28+
zip_safe = False
29+
include_package_data = True
30+
install_requires =
31+
opentelemetry-instrumentation-aiohttp-client==0.29b0
32+
opentelemetry-instrumentation-aiopg==0.29b0
33+
opentelemetry-instrumentation-asgi==0.29b0
34+
opentelemetry-instrumentation-asyncpg==0.29b0
35+
opentelemetry-instrumentation-aws-lambda==0.29b0
36+
opentelemetry-instrumentation-boto==0.29b0
37+
opentelemetry-instrumentation-botocore==0.29b0
38+
opentelemetry-instrumentation-celery==0.29b0
39+
opentelemetry-instrumentation-dbapi==0.29b0
40+
opentelemetry-instrumentation-django==0.29b0
41+
opentelemetry-instrumentation-elasticsearch==0.29b0
42+
opentelemetry-instrumentation-falcon==0.29b0
43+
opentelemetry-instrumentation-fastapi==0.29b0
44+
opentelemetry-instrumentation-flask==0.29b0
45+
opentelemetry-instrumentation-grpc==0.29b0
46+
opentelemetry-instrumentation-httpx==0.29b0
47+
opentelemetry-instrumentation-jinja2==0.29b0
48+
opentelemetry-instrumentation-kafka-python==0.29b0
49+
opentelemetry-instrumentation-logging==0.29b0
50+
opentelemetry-instrumentation-mysql==0.29b0
51+
opentelemetry-instrumentation-pika==0.29b0
52+
opentelemetry-instrumentation-psycopg2==0.29b0
53+
opentelemetry-instrumentation-pymemcache==0.29b0
54+
opentelemetry-instrumentation-pymongo==0.29b0
55+
opentelemetry-instrumentation-pymysql==0.29b0
56+
opentelemetry-instrumentation-pyramid==0.29b0
57+
opentelemetry-instrumentation-redis==0.29b0
58+
opentelemetry-instrumentation-requests==0.29b0
59+
opentelemetry-instrumentation-sklearn==0.29b0
60+
opentelemetry-instrumentation-sqlalchemy==0.29b0
61+
opentelemetry-instrumentation-sqlite3==0.29b0
62+
opentelemetry-instrumentation-starlette==0.29b0
63+
opentelemetry-instrumentation-tornado==0.29b0
64+
opentelemetry-instrumentation-urllib==0.29b0
65+
opentelemetry-instrumentation-urllib3==0.29b0
66+
opentelemetry-instrumentation-wsgi==0.29b0
67+
68+
[options.packages.find]
69+
where = src
70+
71+
[options.extras_require]
72+
test =
73+

Diff for: ‎opentelemetry-contrib-instrumentations/setup.py

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Copyright The OpenTelemetry Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
import os
16+
17+
import setuptools
18+
19+
BASE_DIR = os.path.dirname(__file__)
20+
VERSION_FILENAME = os.path.join(
21+
BASE_DIR, "src", "opentelemetry", "contrib-instrumentations", "version.py"
22+
)
23+
PACKAGE_INFO = {}
24+
with open(VERSION_FILENAME, encoding="utf-8") as f:
25+
exec(f.read(), PACKAGE_INFO)
26+
27+
setuptools.setup(
28+
version=PACKAGE_INFO["__version__"],
29+
)

Diff for: ‎opentelemetry-contrib-instrumentations/src/opentelemetry/contrib-instrumentations/version.py

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright The OpenTelemetry Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
__version__ = "0.28b1"

Diff for: ‎scripts/generate_instrumentation_metapackage.py

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
#!/usr/bin/env python3
2+
3+
# Copyright The OpenTelemetry Authors
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
import logging
18+
import os
19+
from configparser import ConfigParser
20+
21+
logging.basicConfig(level=logging.INFO)
22+
logger = logging.getLogger("instrumentation_metapackage_generator")
23+
24+
_prefix = "opentelemetry-instrumentation-"
25+
26+
27+
root_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
28+
base_instrumentation_path = os.path.join(root_path, "instrumentation")
29+
30+
31+
def get_instrumentation_packages():
32+
for instrumentation in sorted(os.listdir(base_instrumentation_path)):
33+
instrumentation_path = os.path.join(
34+
base_instrumentation_path, instrumentation
35+
)
36+
if not os.path.isdir(
37+
instrumentation_path
38+
) or not instrumentation.startswith(_prefix):
39+
continue
40+
41+
src_dir = os.path.join(
42+
instrumentation_path, "src", "opentelemetry", "instrumentation"
43+
)
44+
src_pkgs = [
45+
f
46+
for f in os.listdir(src_dir)
47+
if os.path.isdir(os.path.join(src_dir, f))
48+
]
49+
assert len(src_pkgs) == 1
50+
name = src_pkgs[0]
51+
52+
pkg_info = {}
53+
version_filename = os.path.join(
54+
src_dir,
55+
name,
56+
"version.py",
57+
)
58+
with open(version_filename, encoding="utf-8") as fh:
59+
exec(fh.read(), pkg_info)
60+
61+
version = pkg_info["__version__"]
62+
yield (instrumentation, version)
63+
64+
65+
def main():
66+
dependencies = get_instrumentation_packages()
67+
68+
setup_cfg_path = os.path.join(
69+
root_path, "opentelemetry-contrib-instrumentations", "setup.cfg"
70+
)
71+
config = ConfigParser()
72+
config.read(setup_cfg_path)
73+
74+
deps = "\n".join(f"{pkg}=={version}" for pkg, version in dependencies)
75+
76+
config["options"]["install_requires"] = "\n" + deps
77+
with open(setup_cfg_path, "w", encoding="utf-8") as fh:
78+
config.write(fh)
79+
80+
81+
if __name__ == "__main__":
82+
main()

Diff for: ‎tox.ini

+1
Original file line numberDiff line numberDiff line change
@@ -529,3 +529,4 @@ commands =
529529
{toxinidir}/scripts/generate_setup.py
530530
{toxinidir}/scripts/generate_instrumentation_bootstrap.py
531531
{toxinidir}/scripts/generate_instrumentation_readme.py
532+
{toxinidir}/scripts/generate_instrumentation_metapackage.py

0 commit comments

Comments
 (0)
Please sign in to comment.