Skip to content

Commit cff9fde

Browse files
owaisowais
committed
Simplify bootstrap and generate code
- We now automatically generate bootstrap_gen.py file from the list of instrumentations present in the source tree. - Bootstrap command now uses consumes this auto-generated list instead of keeping it's own local copy. - We no longer uninstall packages before installing them as instrumentation package no longer specify libraries as dependencies so the edge cases are no longer there. - We no longer try to install an incompatible version or force upgrade/downgrade an installed version. This used to leave systems in broken states which should happen no more.
1 parent 337d331 commit cff9fde

File tree

44 files changed

+1584
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1584
-209
lines changed

‎dev-requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
astor~=0.8.1
12
pylint~=2.6
23
flake8~=3.7
34
isort~=5.6

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -66,6 +68,32 @@
6668

6769
extras_require["test"] = test_deps
6870

71+
72+
class JSONMetadataCommand(distutils.cmd.Command):
73+
74+
description = (
75+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
76+
"auto-generate code in other places",
77+
)
78+
user_options = []
79+
80+
def initialize_options(self):
81+
pass
82+
83+
def finalize_options(self):
84+
pass
85+
86+
def run(self):
87+
metadata = {
88+
"name": config["metadata"]["name"],
89+
"version": PACKAGE_INFO["__version__"],
90+
"instruments": PACKAGE_INFO["_instruments"],
91+
}
92+
print(json.dumps(metadata))
93+
94+
6995
setuptools.setup(
70-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
96+
cmdclass={"meta": JSONMetadataCommand},
97+
version=PACKAGE_INFO["__version__"],
98+
extras_require=extras_require,
7199
)

‎instrumentation/opentelemetry-instrumentation-aiopg/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -56,6 +58,32 @@
5658

5759
extras_require["test"] = test_deps
5860

61+
62+
class JSONMetadataCommand(distutils.cmd.Command):
63+
64+
description = (
65+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
66+
"auto-generate code in other places",
67+
)
68+
user_options = []
69+
70+
def initialize_options(self):
71+
pass
72+
73+
def finalize_options(self):
74+
pass
75+
76+
def run(self):
77+
metadata = {
78+
"name": config["metadata"]["name"],
79+
"version": PACKAGE_INFO["__version__"],
80+
"instruments": PACKAGE_INFO["_instruments"],
81+
}
82+
print(json.dumps(metadata))
83+
84+
5985
setuptools.setup(
60-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
86+
cmdclass={"meta": JSONMetadataCommand},
87+
version=PACKAGE_INFO["__version__"],
88+
extras_require=extras_require,
6189
)

‎instrumentation/opentelemetry-instrumentation-asgi/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -56,6 +58,32 @@
5658

5759
extras_require["test"] = test_deps
5860

61+
62+
class JSONMetadataCommand(distutils.cmd.Command):
63+
64+
description = (
65+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
66+
"auto-generate code in other places",
67+
)
68+
user_options = []
69+
70+
def initialize_options(self):
71+
pass
72+
73+
def finalize_options(self):
74+
pass
75+
76+
def run(self):
77+
metadata = {
78+
"name": config["metadata"]["name"],
79+
"version": PACKAGE_INFO["__version__"],
80+
"instruments": PACKAGE_INFO["_instruments"],
81+
}
82+
print(json.dumps(metadata))
83+
84+
5985
setuptools.setup(
60-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
86+
cmdclass={"meta": JSONMetadataCommand},
87+
version=PACKAGE_INFO["__version__"],
88+
extras_require=extras_require,
6189
)

‎instrumentation/opentelemetry-instrumentation-asyncpg/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -66,6 +68,32 @@
6668

6769
extras_require["test"] = test_deps
6870

71+
72+
class JSONMetadataCommand(distutils.cmd.Command):
73+
74+
description = (
75+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
76+
"auto-generate code in other places",
77+
)
78+
user_options = []
79+
80+
def initialize_options(self):
81+
pass
82+
83+
def finalize_options(self):
84+
pass
85+
86+
def run(self):
87+
metadata = {
88+
"name": config["metadata"]["name"],
89+
"version": PACKAGE_INFO["__version__"],
90+
"instruments": PACKAGE_INFO["_instruments"],
91+
}
92+
print(json.dumps(metadata))
93+
94+
6995
setuptools.setup(
70-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
96+
cmdclass={"meta": JSONMetadataCommand},
97+
version=PACKAGE_INFO["__version__"],
98+
extras_require=extras_require,
7199
)

‎instrumentation/opentelemetry-instrumentation-boto/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -56,6 +58,32 @@
5658

5759
extras_require["test"] = test_deps
5860

61+
62+
class JSONMetadataCommand(distutils.cmd.Command):
63+
64+
description = (
65+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
66+
"auto-generate code in other places",
67+
)
68+
user_options = []
69+
70+
def initialize_options(self):
71+
pass
72+
73+
def finalize_options(self):
74+
pass
75+
76+
def run(self):
77+
metadata = {
78+
"name": config["metadata"]["name"],
79+
"version": PACKAGE_INFO["__version__"],
80+
"instruments": PACKAGE_INFO["_instruments"],
81+
}
82+
print(json.dumps(metadata))
83+
84+
5985
setuptools.setup(
60-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
86+
cmdclass={"meta": JSONMetadataCommand},
87+
version=PACKAGE_INFO["__version__"],
88+
extras_require=extras_require,
6189
)

‎instrumentation/opentelemetry-instrumentation-botocore/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -66,6 +68,32 @@
6668

6769
extras_require["test"] = test_deps
6870

71+
72+
class JSONMetadataCommand(distutils.cmd.Command):
73+
74+
description = (
75+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
76+
"auto-generate code in other places",
77+
)
78+
user_options = []
79+
80+
def initialize_options(self):
81+
pass
82+
83+
def finalize_options(self):
84+
pass
85+
86+
def run(self):
87+
metadata = {
88+
"name": config["metadata"]["name"],
89+
"version": PACKAGE_INFO["__version__"],
90+
"instruments": PACKAGE_INFO["_instruments"],
91+
}
92+
print(json.dumps(metadata))
93+
94+
6995
setuptools.setup(
70-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
96+
cmdclass={"meta": JSONMetadataCommand},
97+
version=PACKAGE_INFO["__version__"],
98+
extras_require=extras_require,
7199
)

‎instrumentation/opentelemetry-instrumentation-celery/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -56,6 +58,32 @@
5658

5759
extras_require["test"] = test_deps
5860

61+
62+
class JSONMetadataCommand(distutils.cmd.Command):
63+
64+
description = (
65+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
66+
"auto-generate code in other places",
67+
)
68+
user_options = []
69+
70+
def initialize_options(self):
71+
pass
72+
73+
def finalize_options(self):
74+
pass
75+
76+
def run(self):
77+
metadata = {
78+
"name": config["metadata"]["name"],
79+
"version": PACKAGE_INFO["__version__"],
80+
"instruments": PACKAGE_INFO["_instruments"],
81+
}
82+
print(json.dumps(metadata))
83+
84+
5985
setuptools.setup(
60-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
86+
cmdclass={"meta": JSONMetadataCommand},
87+
version=PACKAGE_INFO["__version__"],
88+
extras_require=extras_require,
6189
)

‎instrumentation/opentelemetry-instrumentation-dbapi/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -56,6 +58,32 @@
5658

5759
extras_require["test"] = test_deps
5860

61+
62+
class JSONMetadataCommand(distutils.cmd.Command):
63+
64+
description = (
65+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
66+
"auto-generate code in other places",
67+
)
68+
user_options = []
69+
70+
def initialize_options(self):
71+
pass
72+
73+
def finalize_options(self):
74+
pass
75+
76+
def run(self):
77+
metadata = {
78+
"name": config["metadata"]["name"],
79+
"version": PACKAGE_INFO["__version__"],
80+
"instruments": PACKAGE_INFO["_instruments"],
81+
}
82+
print(json.dumps(metadata))
83+
84+
5985
setuptools.setup(
60-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
86+
cmdclass={"meta": JSONMetadataCommand},
87+
version=PACKAGE_INFO["__version__"],
88+
extras_require=extras_require,
6189
)

‎instrumentation/opentelemetry-instrumentation-django/setup.py

+29-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
# RUN `python scripts/generate_setup.py` TO REGENERATE.
1818

1919

20+
import distutils.cmd
21+
import json
2022
import os
2123
from configparser import ConfigParser
2224

@@ -56,6 +58,32 @@
5658

5759
extras_require["test"] = test_deps
5860

61+
62+
class JSONMetadataCommand(distutils.cmd.Command):
63+
64+
description = (
65+
"print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ",
66+
"auto-generate code in other places",
67+
)
68+
user_options = []
69+
70+
def initialize_options(self):
71+
pass
72+
73+
def finalize_options(self):
74+
pass
75+
76+
def run(self):
77+
metadata = {
78+
"name": config["metadata"]["name"],
79+
"version": PACKAGE_INFO["__version__"],
80+
"instruments": PACKAGE_INFO["_instruments"],
81+
}
82+
print(json.dumps(metadata))
83+
84+
5985
setuptools.setup(
60-
version=PACKAGE_INFO["__version__"], extras_require=extras_require
86+
cmdclass={"meta": JSONMetadataCommand},
87+
version=PACKAGE_INFO["__version__"],
88+
extras_require=extras_require,
6189
)

0 commit comments

Comments
 (0)