From 286f26bbed53e87ac332fc25b802eb5e06b06f91 Mon Sep 17 00:00:00 2001 From: ItayGibel-heliosphere <89069190+ItayGibel-heliosphere@users.noreply.github.com> Date: Tue, 26 Oct 2021 12:23:11 +0300 Subject: [PATCH 1/2] Pika - add publish_hook and consume_hook (#763) --- CHANGELOG.md | 5 + .../instrumentation/pika/__init__.py | 15 +++ .../instrumentation/pika/pika_instrumentor.py | 65 ++++++++++--- .../instrumentation/pika/utils.py | 19 ++++ .../tests/test_pika_instrumentation.py | 5 +- .../tests/test_utils.py | 92 +++++++++++++++++++ 6 files changed, 184 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 941fa396f9..8ce4671581 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `opentelemetry-distro` uses the correct entrypoint name which was updated in the core release of 1.6.0 but the distro was not updated with it ([#755](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/755)) + +### Added +- `opentelemetry-instrumentation-pika` Add `publish_hook` and `consume_hook` callbacks passed as arguments to the instrument method + ([#763](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/763)) + ## [1.6.1-0.25b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.1-0.25b1) - 2021-10-18 diff --git a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/__init__.py b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/__init__.py index 55ff695820..5f428eadd7 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/__init__.py @@ -62,6 +62,21 @@ PikaInstrumentor.instrument_channel(channel, tracer_provider=tracer_provider) +* PikaInstrumentor also supports instrumenting with hooks that will be called when producing or consuming a message. + The hooks should be of type `Callable[[Span, bytes, BasicProperties], None]` + where the first parameter is the span, the second parameter is the message body + and the third parameter is the message properties + +.. code-block:: python + + def publish_hook(span: Span, body: bytes, properties: BasicProperties): + span.set_attribute("messaging.payload", body.decode()) + + def consume_hook(span: Span, body: bytes, properties: BasicProperties): + span.set_attribute("messaging.id", properties.message_id) + + PikaInstrumentor.instrument_channel(channel, publish_hook=publish_hook, consume_hook=consume_hook) + API --- """ diff --git a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/pika_instrumentor.py b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/pika_instrumentor.py index cc088c9ad0..072ee56cfd 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/pika_instrumentor.py +++ b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/pika_instrumentor.py @@ -36,11 +36,16 @@ class PikaInstrumentor(BaseInstrumentor): # type: ignore # pylint: disable=attribute-defined-outside-init @staticmethod def _instrument_blocking_channel_consumers( - channel: BlockingChannel, tracer: Tracer + channel: BlockingChannel, + tracer: Tracer, + consume_hook: utils.HookT = utils.dummy_callback, ) -> Any: for consumer_tag, consumer_info in channel._consumer_infos.items(): decorated_callback = utils._decorate_callback( - consumer_info.on_message_callback, tracer, consumer_tag + consumer_info.on_message_callback, + tracer, + consumer_tag, + consume_hook, ) setattr( @@ -52,11 +57,13 @@ def _instrument_blocking_channel_consumers( @staticmethod def _instrument_basic_publish( - channel: BlockingChannel, tracer: Tracer + channel: BlockingChannel, + tracer: Tracer, + publish_hook: utils.HookT = utils.dummy_callback, ) -> None: original_function = getattr(channel, "basic_publish") decorated_function = utils._decorate_basic_publish( - original_function, channel, tracer + original_function, channel, tracer, publish_hook ) setattr(decorated_function, "_original_function", original_function) channel.__setattr__("basic_publish", decorated_function) @@ -64,10 +71,14 @@ def _instrument_basic_publish( @staticmethod def _instrument_channel_functions( - channel: BlockingChannel, tracer: Tracer + channel: BlockingChannel, + tracer: Tracer, + publish_hook: utils.HookT = utils.dummy_callback, ) -> None: if hasattr(channel, "basic_publish"): - PikaInstrumentor._instrument_basic_publish(channel, tracer) + PikaInstrumentor._instrument_basic_publish( + channel, tracer, publish_hook + ) @staticmethod def _uninstrument_channel_functions(channel: BlockingChannel) -> None: @@ -84,6 +95,8 @@ def _uninstrument_channel_functions(channel: BlockingChannel) -> None: def instrument_channel( channel: BlockingChannel, tracer_provider: Optional[TracerProvider] = None, + publish_hook: utils.HookT = utils.dummy_callback, + consume_hook: utils.HookT = utils.dummy_callback, ) -> None: if not hasattr(channel, "_is_instrumented_by_opentelemetry"): channel._is_instrumented_by_opentelemetry = False @@ -94,10 +107,12 @@ def instrument_channel( return tracer = trace.get_tracer(__name__, __version__, tracer_provider) PikaInstrumentor._instrument_blocking_channel_consumers( - channel, tracer + channel, tracer, consume_hook + ) + PikaInstrumentor._decorate_basic_consume(channel, tracer, consume_hook) + PikaInstrumentor._instrument_channel_functions( + channel, tracer, publish_hook ) - PikaInstrumentor._decorate_basic_consume(channel, tracer) - PikaInstrumentor._instrument_channel_functions(channel, tracer) @staticmethod def uninstrument_channel(channel: BlockingChannel) -> None: @@ -118,24 +133,33 @@ def uninstrument_channel(channel: BlockingChannel) -> None: PikaInstrumentor._uninstrument_channel_functions(channel) def _decorate_channel_function( - self, tracer_provider: Optional[TracerProvider] + self, + tracer_provider: Optional[TracerProvider], + publish_hook: utils.HookT = utils.dummy_callback, + consume_hook: utils.HookT = utils.dummy_callback, ) -> None: def wrapper(wrapped, instance, args, kwargs): channel = wrapped(*args, **kwargs) - self.instrument_channel(channel, tracer_provider=tracer_provider) + self.instrument_channel( + channel, + tracer_provider=tracer_provider, + publish_hook=publish_hook, + consume_hook=consume_hook, + ) return channel wrapt.wrap_function_wrapper(BlockingConnection, "channel", wrapper) @staticmethod def _decorate_basic_consume( - channel: BlockingChannel, tracer: Optional[Tracer] + channel: BlockingChannel, + tracer: Optional[Tracer], + consume_hook: utils.HookT = utils.dummy_callback, ) -> None: def wrapper(wrapped, instance, args, kwargs): return_value = wrapped(*args, **kwargs) - PikaInstrumentor._instrument_blocking_channel_consumers( - channel, tracer + channel, tracer, consume_hook ) return return_value @@ -143,8 +167,19 @@ def wrapper(wrapped, instance, args, kwargs): def _instrument(self, **kwargs: Dict[str, Any]) -> None: tracer_provider: TracerProvider = kwargs.get("tracer_provider", None) + publish_hook: utils.HookT = kwargs.get( + "publish_hook", utils.dummy_callback + ) + consume_hook: utils.HookT = kwargs.get( + "consume_hook", utils.dummy_callback + ) + self.__setattr__("__opentelemetry_tracer_provider", tracer_provider) - self._decorate_channel_function(tracer_provider) + self._decorate_channel_function( + tracer_provider, + publish_hook=publish_hook, + consume_hook=consume_hook, + ) def _uninstrument(self, **kwargs: Dict[str, Any]) -> None: if hasattr(self, "__opentelemetry_tracer_provider"): diff --git a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/utils.py b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/utils.py index 5cd6ca795f..830033bbe5 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/utils.py +++ b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/utils.py @@ -1,3 +1,4 @@ +from logging import getLogger from typing import Any, Callable, List, Optional from pika.channel import Channel @@ -13,6 +14,8 @@ from opentelemetry.trace import SpanKind, Tracer from opentelemetry.trace.span import Span +_LOG = getLogger(__name__) + class _PikaGetter(Getter): # type: ignore def get(self, carrier: CarrierT, key: str) -> Optional[List[str]]: @@ -27,11 +30,18 @@ def keys(self, carrier: CarrierT) -> List[str]: _pika_getter = _PikaGetter() +HookT = Callable[[Span, bytes, BasicProperties], None] + + +def dummy_callback(span: Span, body: bytes, properties: BasicProperties): + ... + def _decorate_callback( callback: Callable[[Channel, Basic.Deliver, BasicProperties, bytes], Any], tracer: Tracer, task_name: str, + consume_hook: HookT = dummy_callback, ): def decorated_callback( channel: Channel, @@ -60,6 +70,10 @@ def decorated_callback( ) try: with trace.use_span(span, end_on_exit=True): + try: + consume_hook(span, body, properties) + except Exception as hook_exception: # pylint: disable=W0703 + _LOG.exception(hook_exception) retval = callback(channel, method, properties, body) finally: context.detach(token) @@ -72,6 +86,7 @@ def _decorate_basic_publish( original_function: Callable[[str, str, bytes, BasicProperties, bool], Any], channel: Channel, tracer: Tracer, + publish_hook: HookT = dummy_callback, ): def decorated_function( exchange: str, @@ -100,6 +115,10 @@ def decorated_function( with trace.use_span(span, end_on_exit=True): if span.is_recording(): propagate.inject(properties.headers) + try: + publish_hook(span, body, properties) + except Exception as hook_exception: # pylint: disable=W0703 + _LOG.exception(hook_exception) retval = original_function( exchange, routing_key, body, properties, mandatory ) diff --git a/instrumentation/opentelemetry-instrumentation-pika/tests/test_pika_instrumentation.py b/instrumentation/opentelemetry-instrumentation-pika/tests/test_pika_instrumentation.py index 711377a17e..410ccf069f 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/tests/test_pika_instrumentation.py +++ b/instrumentation/opentelemetry-instrumentation-pika/tests/test_pika_instrumentation.py @@ -18,6 +18,7 @@ from wrapt import BoundFunctionWrapper from opentelemetry.instrumentation.pika import PikaInstrumentor +from opentelemetry.instrumentation.pika.utils import dummy_callback from opentelemetry.trace import Tracer @@ -72,7 +73,7 @@ def test_instrument_consumers( ) -> None: tracer = mock.MagicMock(spec=Tracer) expected_decoration_calls = [ - mock.call(value.on_message_callback, tracer, key) + mock.call(value.on_message_callback, tracer, key, dummy_callback) for key, value in self.channel._consumer_infos.items() ] PikaInstrumentor._instrument_blocking_channel_consumers( @@ -96,7 +97,7 @@ def test_instrument_basic_publish( original_function = self.channel.basic_publish PikaInstrumentor._instrument_basic_publish(self.channel, tracer) decorate_basic_publish.assert_called_once_with( - original_function, self.channel, tracer + original_function, self.channel, tracer, dummy_callback ) self.assertEqual( self.channel.basic_publish, decorate_basic_publish.return_value diff --git a/instrumentation/opentelemetry-instrumentation-pika/tests/test_utils.py b/instrumentation/opentelemetry-instrumentation-pika/tests/test_utils.py index 2cc75b8cbf..9b1aed7f49 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/tests/test_utils.py +++ b/instrumentation/opentelemetry-instrumentation-pika/tests/test_utils.py @@ -212,6 +212,52 @@ def test_decorate_callback( ) self.assertEqual(retval, callback.return_value) + @mock.patch("opentelemetry.instrumentation.pika.utils._get_span") + @mock.patch("opentelemetry.propagate.extract") + @mock.patch("opentelemetry.trace.use_span") + def test_decorate_callback_with_hook( + self, + use_span: mock.MagicMock, + extract: mock.MagicMock, + get_span: mock.MagicMock, + ) -> None: + callback = mock.MagicMock() + mock_task_name = "mock_task_name" + tracer = mock.MagicMock() + channel = mock.MagicMock(spec=Channel) + method = mock.MagicMock(spec=Basic.Deliver) + method.exchange = "test_exchange" + properties = mock.MagicMock() + mock_body = b"mock_body" + consume_hook = mock.MagicMock() + + decorated_callback = utils._decorate_callback( + callback, tracer, mock_task_name, consume_hook + ) + retval = decorated_callback(channel, method, properties, mock_body) + extract.assert_called_once_with( + properties.headers, getter=utils._pika_getter + ) + get_span.assert_called_once_with( + tracer, + channel, + properties, + destination=method.exchange, + span_kind=SpanKind.CONSUMER, + task_name=mock_task_name, + operation=MessagingOperationValues.RECEIVE, + ) + use_span.assert_called_once_with( + get_span.return_value, end_on_exit=True + ) + consume_hook.assert_called_once_with( + get_span.return_value, mock_body, properties + ) + callback.assert_called_once_with( + channel, method, properties, mock_body + ) + self.assertEqual(retval, callback.return_value) + @mock.patch("opentelemetry.instrumentation.pika.utils._get_span") @mock.patch("opentelemetry.propagate.inject") @mock.patch("opentelemetry.trace.use_span") @@ -310,3 +356,49 @@ def test_decorate_basic_publish_published_message_to_queue( task_name="(temporary)", operation=None, ) + + @mock.patch("opentelemetry.instrumentation.pika.utils._get_span") + @mock.patch("opentelemetry.propagate.inject") + @mock.patch("opentelemetry.trace.use_span") + def test_decorate_basic_publish_with_hook( + self, + use_span: mock.MagicMock, + inject: mock.MagicMock, + get_span: mock.MagicMock, + ) -> None: + callback = mock.MagicMock() + tracer = mock.MagicMock() + channel = mock.MagicMock(spec=Channel) + exchange_name = "test-exchange" + routing_key = "test-routing-key" + properties = mock.MagicMock() + mock_body = b"mock_body" + publish_hook = mock.MagicMock() + + decorated_basic_publish = utils._decorate_basic_publish( + callback, channel, tracer, publish_hook + ) + retval = decorated_basic_publish( + exchange_name, routing_key, mock_body, properties + ) + get_span.assert_called_once_with( + tracer, + channel, + properties, + destination=exchange_name, + span_kind=SpanKind.PRODUCER, + task_name="(temporary)", + operation=None, + ) + use_span.assert_called_once_with( + get_span.return_value, end_on_exit=True + ) + get_span.return_value.is_recording.assert_called_once() + inject.assert_called_once_with(properties.headers) + publish_hook.assert_called_once_with( + get_span.return_value, mock_body, properties + ) + callback.assert_called_once_with( + exchange_name, routing_key, mock_body, properties, False + ) + self.assertEqual(retval, callback.return_value) From dbc6a86bf1a460aa0ae5357a1f9e5a381efb3dda Mon Sep 17 00:00:00 2001 From: "(Eliseo) Nathaniel Ruiz Nowell" Date: Tue, 26 Oct 2021 11:28:12 -0400 Subject: [PATCH 2/2] Add instrumentation for AWS Lambda Service - pkg metadata files (Part 1/2) (#739) * Add instrumentation for AWS Lambda Service * Add AWS Lambda package metadata files --- CHANGELOG.md | 2 + instrumentation/README.md | 1 + .../LICENSE | 201 ++++++++++++++++++ .../MANIFEST.in | 8 + .../README.rst | 30 +++ .../setup.cfg | 56 +++++ .../setup.py | 99 +++++++++ .../instrumentation/aws_lambda/__init__.py | 13 ++ .../instrumentation/aws_lambda/package.py | 16 ++ .../instrumentation/aws_lambda/version.py | 15 ++ .../tests/test_aws_lambda_instrumentation.py | 13 ++ .../instrumentation/bootstrap_gen.py | 1 + 12 files changed, 455 insertions(+) create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/LICENSE create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/MANIFEST.in create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/README.rst create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/setup.py create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/package.py create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py create mode 100644 instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ce4671581..d3a746c5f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.2-0.25b2...HEAD) +- `opentelemetry-instrumentation-aws-lambda` Add instrumentation for AWS Lambda Service - pkg metadata files (Part 1/2) + ([#739](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/739)) ### Fixed diff --git a/instrumentation/README.md b/instrumentation/README.md index 84fdc2e8de..4d6ecf94aa 100644 --- a/instrumentation/README.md +++ b/instrumentation/README.md @@ -5,6 +5,7 @@ | [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 1.3.0 | | [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | | [opentelemetry-instrumentation-asyncpg](./opentelemetry-instrumentation-asyncpg) | asyncpg >= 0.12.0 | +| [opentelemetry-instrumentation-aws-lambda](./opentelemetry-instrumentation-aws-lambda) | aws_lambda | | [opentelemetry-instrumentation-boto](./opentelemetry-instrumentation-boto) | boto~=2.0 | | [opentelemetry-instrumentation-botocore](./opentelemetry-instrumentation-botocore) | botocore ~= 1.0 | | [opentelemetry-instrumentation-celery](./opentelemetry-instrumentation-celery) | celery >= 4.0, < 6.0 | diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/LICENSE b/instrumentation/opentelemetry-instrumentation-aws-lambda/LICENSE new file mode 100644 index 0000000000..1ef7dad2c5 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright The OpenTelemetry Authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-aws-lambda/MANIFEST.in new file mode 100644 index 0000000000..faee277146 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/MANIFEST.in @@ -0,0 +1,8 @@ +graft src +graft tests +global-exclude *.pyc +global-exclude *.pyo +global-exclude __pycache__/* +include MANIFEST.in +include README.rst +include LICENSE diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/README.rst b/instrumentation/opentelemetry-instrumentation-aws-lambda/README.rst new file mode 100644 index 0000000000..f545b57cf0 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/README.rst @@ -0,0 +1,30 @@ +OpenTelemetry AWS Lambda Tracing +================================ + +|pypi| + +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-aws-lambda.svg + :target: https://pypi.org/project/opentelemetry-instrumentation-aws-lambda/ + +This library provides an Instrumentor used to trace requests made by the Lambda +functions on the AWS Lambda service. + +It also provides scripts used by AWS Lambda Layers to automatically initialize +the OpenTelemetry SDK. Learn more on the AWS Distro for OpenTelemetry (ADOT) +`documentation for the Python Lambda Layer `_. + +Installation +------------ + +:: + + pip install opentelemetry-instrumentation-aws-lambda + + +References +---------- + +* `OpenTelemetry AWS Lambda Tracing `_ +* `OpenTelemetry Project `_ +* `OpenTelemetry Python Examples `_ +* `ADOT Python Lambda Layer Documentation `_ diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg b/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg new file mode 100644 index 0000000000..025db7b102 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg @@ -0,0 +1,56 @@ +# Copyright The OpenTelemetry Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +[metadata] +name = opentelemetry-instrumentation-aws-lambda +description = OpenTelemetry AWS Lambda instrumentation +long_description = file: README.rst +long_description_content_type = text/x-rst +author = OpenTelemetry Authors +author_email = cncf-opentelemetry-contributors@lists.cncf.io +url = https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-aws-lambda +platforms = any +license = Apache-2.0 +classifiers = + Development Status :: 4 - Beta + Intended Audience :: Developers + License :: OSI Approved :: Apache Software License + Programming Language :: Python + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + +[options] +python_requires = >=3.6 +package_dir= + =src +packages=find_namespace: +install_requires = + opentelemetry-instrumentation == 0.25b2 + opentelemetry-propagator-aws-xray == 1.0.1 + opentelemetry-semantic-conventions == 0.25b2 + +[options.extras_require] +test = + opentelemetry-test == 0.25b2 + +[options.packages.find] +where = src + +[options.entry_points] +# NOTE: (NathanielRN) DO NOT add AwsLambdaInstrumentor entry point because +# current AWS Lambda implementation reloads a fresh import of the user's Lambda +# handler. Auto Instrumentation runs _before_ and if it instruments the handler +# that patching will be lost. diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.py new file mode 100644 index 0000000000..d1a8664236 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.py @@ -0,0 +1,99 @@ +# Copyright The OpenTelemetry Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# DO NOT EDIT. THIS FILE WAS AUTOGENERATED FROM templates/instrumentation_setup.py.txt. +# RUN `python scripts/generate_setup.py` TO REGENERATE. + + +import distutils.cmd +import json +import os +from configparser import ConfigParser + +import setuptools + +config = ConfigParser() +config.read("setup.cfg") + +# We provide extras_require parameter to setuptools.setup later which +# overwrites the extra_require section from setup.cfg. To support extra_require +# secion in setup.cfg, we load it here and merge it with the extra_require param. +extras_require = {} +if "options.extras_require" in config: + for key, value in config["options.extras_require"].items(): + extras_require[key] = [v for v in value.split("\n") if v.strip()] + +BASE_DIR = os.path.dirname(__file__) +PACKAGE_INFO = {} + +VERSION_FILENAME = os.path.join( + BASE_DIR, + "src", + "opentelemetry", + "instrumentation", + "aws_lambda", + "version.py", +) +with open(VERSION_FILENAME, encoding="utf-8") as f: + exec(f.read(), PACKAGE_INFO) + +PACKAGE_FILENAME = os.path.join( + BASE_DIR, + "src", + "opentelemetry", + "instrumentation", + "aws_lambda", + "package.py", +) +with open(PACKAGE_FILENAME, encoding="utf-8") as f: + exec(f.read(), PACKAGE_INFO) + +# Mark any instruments/runtime dependencies as test dependencies as well. +extras_require["instruments"] = PACKAGE_INFO["_instruments"] +test_deps = extras_require.get("test", []) +for dep in extras_require["instruments"]: + test_deps.append(dep) + +extras_require["test"] = test_deps + + +class JSONMetadataCommand(distutils.cmd.Command): + + description = ( + "print out package metadata as JSON. This is used by OpenTelemetry dev scripts to ", + "auto-generate code in other places", + ) + user_options = [] + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + metadata = { + "name": config["metadata"]["name"], + "version": PACKAGE_INFO["__version__"], + "instruments": PACKAGE_INFO["_instruments"], + } + print(json.dumps(metadata)) + + +setuptools.setup( + cmdclass={"meta": JSONMetadataCommand}, + version=PACKAGE_INFO["__version__"], + extras_require=extras_require, +) diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py new file mode 100644 index 0000000000..6ab2e961ec --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py @@ -0,0 +1,13 @@ +# Copyright 2020, OpenTelemetry Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/package.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/package.py new file mode 100644 index 0000000000..7a66a17a93 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/package.py @@ -0,0 +1,16 @@ +# Copyright The OpenTelemetry Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +_instruments = tuple() diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py new file mode 100644 index 0000000000..b3fbda5fcb --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py @@ -0,0 +1,15 @@ +# Copyright The OpenTelemetry Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +__version__ = "0.25b2" diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation.py new file mode 100644 index 0000000000..b0a6f42841 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation.py @@ -0,0 +1,13 @@ +# Copyright The OpenTelemetry Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py index 2bf865116a..5c59cb6eb8 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py @@ -134,6 +134,7 @@ }, } default_instrumentations = [ + "opentelemetry-instrumentation-aws-lambda==0.25b2", "opentelemetry-instrumentation-dbapi==0.25b2", "opentelemetry-instrumentation-logging==0.25b2", "opentelemetry-instrumentation-sqlite3==0.25b2",