diff --git a/CHANGELOG.md b/CHANGELOG.md index b80112e314..8bcd1ecf2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Refactoring custom header collection API for consistency ([#1064](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1064)) +### Added +- `opentelemetry-instrument` and `opentelemetry-bootstrap` now include a `--version` flag + ([#1065](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1065)) + ## [1.11.1-0.30b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.11.1-0.30b1) - 2022-04-21 ### Added diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py index 932022c24f..7d2ca83294 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py @@ -23,6 +23,8 @@ from pkg_resources import iter_entry_points +from opentelemetry.instrumentation.version import __version__ + _logger = getLogger(__name__) @@ -34,7 +36,7 @@ def run() -> None: program and its dependencies and then runs the program. """, epilog=""" - Optional arguments (except for --help) for opentelemetry-instrument + Optional arguments (except for --help and --version) for opentelemetry-instrument directly correspond with OpenTelemetry environment variables. The corresponding optional argument is formed by removing the OTEL_ or OTEL_PYTHON_ prefix from the environment variable and lower casing the @@ -66,6 +68,12 @@ def run() -> None: ) argument_otel_environment_variable[argument] = attribute + parser.add_argument( + "--version", + help="print version information", + action="version", + version="%(prog)s " + __version__, + ) parser.add_argument("command", help="Your Python application.") parser.add_argument( "command_args", diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py index ecec602268..6fa36f0463 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py @@ -25,6 +25,7 @@ default_instrumentations, libraries, ) +from opentelemetry.instrumentation.version import __version__ logger = logging.getLogger(__name__) @@ -133,6 +134,12 @@ def run() -> None: installs the relevant instrumentation packages for them. """ ) + parser.add_argument( + "--version", + help="print version information", + action="version", + version="%(prog)s " + __version__, + ) parser.add_argument( "-a", "--action",