diff --git a/.github/workflows/update-sha.yml b/.github/workflows/update-sha.yml deleted file mode 100644 index e5418d9294..0000000000 --- a/.github/workflows/update-sha.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Update SHA - -on: issue_comment - -jobs: - update-pr-sha: - name: Update SHA - if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, 'update-sha') }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - token: ${{ secrets.BOT_TOKEN }} - - # would have been lit if github supported string split expression - - name: Extract branch name from comment to get commit SHA - uses: jungwinter/split@v2 - id: split - with: - msg: ${{ github.event.comment.body }} - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - - name: Use CLA approved github bot - run: .github/scripts/use-cla-approved-github-bot.sh - - - name: Checkout Pull Request - env: - GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} - run: | - PR_URL="${{ github.event.issue.pull_request.url }}" - PR_NUM=${PR_URL##*/} - echo "Checking out from PR #$PR_NUM based on URL: $PR_URL" - hub pr checkout $PR_NUM - - # caching is not supported for this event type - - name: Run script - run: | - python -m pip install requests==2.28.1 ruamel.yaml==0.17.21 - python scripts/update_sha.py --branch ${{ steps.split.outputs._1 }} - - - name: Commit and Push changes - env: - GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} - run: | - git commit -a -m "Update SHA" - git push diff --git a/CHANGELOG.md b/CHANGELOG.md index 49c9de5eb5..9b343cf667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#1555](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1555)) - `opentelemetry-instrumentation-asgi` Fix keys() in class ASGIGetter to correctly fetch values from carrier headers. ([#1435](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1435)) - +- mongo db - fix db statement capturing + ([#1512](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1512)) ## Version 1.15.0/0.36b0 (2022-12-10) diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py index 65315b2be5..14b503cbd8 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py @@ -46,6 +46,7 @@ failed_hook (Callable) - a function with extra user-defined logic to be performed after the query returns with a failed response this function signature is: def failed_hook(span: Span, event: CommandFailedEvent) -> None +capture_statement (bool) - an optional value to enable capturing the database statement that is being executed for example: @@ -81,6 +82,9 @@ def failed_hook(span, event): from opentelemetry import context from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.instrumentation.pymongo.package import _instruments +from opentelemetry.instrumentation.pymongo.utils import ( + COMMAND_TO_ATTRIBUTE_MAPPING, +) from opentelemetry.instrumentation.pymongo.version import __version__ from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY from opentelemetry.semconv.trace import DbSystemValues, SpanAttributes @@ -106,6 +110,7 @@ def __init__( request_hook: RequestHookT = dummy_callback, response_hook: ResponseHookT = dummy_callback, failed_hook: FailedHookT = dummy_callback, + capture_statement: bool = False, ): self._tracer = tracer self._span_dict = {} @@ -113,6 +118,7 @@ def __init__( self.start_hook = request_hook self.success_hook = response_hook self.failed_hook = failed_hook + self.capture_statement = capture_statement def started(self, event: monitoring.CommandStartedEvent): """Method to handle a pymongo CommandStartedEvent""" @@ -120,16 +126,13 @@ def started(self, event: monitoring.CommandStartedEvent): _SUPPRESS_INSTRUMENTATION_KEY ): return - command = event.command.get(event.command_name, "") - name = event.database_name - name += "." + event.command_name - statement = event.command_name - if command: - statement += " " + str(command) + command_name = event.command_name + span_name = f"{event.database_name}.{command_name}" + statement = self._get_statement_by_command_name(command_name, event) collection = event.command.get(event.command_name) try: - span = self._tracer.start_span(name, kind=SpanKind.CLIENT) + span = self._tracer.start_span(span_name, kind=SpanKind.CLIENT) if span.is_recording(): span.set_attribute( SpanAttributes.DB_SYSTEM, DbSystemValues.MONGODB.value @@ -196,6 +199,14 @@ def failed(self, event: monitoring.CommandFailedEvent): def _pop_span(self, event): return self._span_dict.pop(_get_span_dict_key(event), None) + def _get_statement_by_command_name(self, command_name, event): + statement = command_name + command_attribute = COMMAND_TO_ATTRIBUTE_MAPPING.get(command_name) + command = event.command.get(command_attribute) + if command and self.capture_statement: + statement += " " + str(command) + return statement + def _get_span_dict_key(event): if event.connection_id is not None: @@ -228,6 +239,7 @@ def _instrument(self, **kwargs): request_hook = kwargs.get("request_hook", dummy_callback) response_hook = kwargs.get("response_hook", dummy_callback) failed_hook = kwargs.get("failed_hook", dummy_callback) + capture_statement = kwargs.get("capture_statement") # Create and register a CommandTracer only the first time if self._commandtracer_instance is None: tracer = get_tracer(__name__, __version__, tracer_provider) @@ -237,6 +249,7 @@ def _instrument(self, **kwargs): request_hook=request_hook, response_hook=response_hook, failed_hook=failed_hook, + capture_statement=capture_statement, ) monitoring.register(self._commandtracer_instance) # If already created, just enable it diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/utils.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/utils.py new file mode 100644 index 0000000000..47f5653f0e --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/utils.py @@ -0,0 +1,20 @@ +# 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. + +COMMAND_TO_ATTRIBUTE_MAPPING = { + "insert": "documents", + "delete": "deletes", + "update": "updates", + "find": "filter", +} diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/tests/test_pymongo.py b/instrumentation/opentelemetry-instrumentation-pymongo/tests/test_pymongo.py index 69e01b03ed..8eab3b701c 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/tests/test_pymongo.py +++ b/instrumentation/opentelemetry-instrumentation-pymongo/tests/test_pymongo.py @@ -64,7 +64,7 @@ def test_started(self): span.attributes[SpanAttributes.DB_NAME], "database_name" ) self.assertEqual( - span.attributes[SpanAttributes.DB_STATEMENT], "command_name find" + span.attributes[SpanAttributes.DB_STATEMENT], "command_name" ) self.assertEqual( span.attributes[SpanAttributes.NET_PEER_NAME], "test.com" diff --git a/tests/opentelemetry-docker-tests/tests/pymongo/test_pymongo_functional.py b/tests/opentelemetry-docker-tests/tests/pymongo/test_pymongo_functional.py index e8158c0657..c506d0452a 100644 --- a/tests/opentelemetry-docker-tests/tests/pymongo/test_pymongo_functional.py +++ b/tests/opentelemetry-docker-tests/tests/pymongo/test_pymongo_functional.py @@ -34,6 +34,7 @@ def setUp(self): self.instrumentor = PymongoInstrumentor() self.instrumentor.instrument() self.instrumentor._commandtracer_instance._tracer = self._tracer + self.instrumentor._commandtracer_instance.capture_statement = True client = MongoClient( MONGODB_HOST, MONGODB_PORT, serverSelectionTimeoutMS=2000 ) @@ -44,7 +45,7 @@ def tearDown(self): self.instrumentor.uninstrument() super().tearDown() - def validate_spans(self): + def validate_spans(self, expected_db_statement): spans = self.memory_exporter.get_finished_spans() self.assertEqual(len(spans), 2) for span in spans: @@ -72,14 +73,24 @@ def validate_spans(self): pymongo_span.attributes[SpanAttributes.DB_MONGODB_COLLECTION], MONGODB_COLLECTION_NAME, ) + self.assertEqual( + pymongo_span.attributes[SpanAttributes.DB_STATEMENT], + expected_db_statement, + ) def test_insert(self): """Should create a child span for insert""" with self._tracer.start_as_current_span("rootSpan"): - self._collection.insert_one( + insert_result = self._collection.insert_one( {"name": "testName", "value": "testValue"} ) - self.validate_spans() + insert_result_id = insert_result.inserted_id + + expected_db_statement = ( + f"insert [{{'name': 'testName', 'value': 'testValue', '_id': " + f"ObjectId('{insert_result_id}')}}]" + ) + self.validate_spans(expected_db_statement) def test_update(self): """Should create a child span for update""" @@ -87,19 +98,40 @@ def test_update(self): self._collection.update_one( {"name": "testName"}, {"$set": {"value": "someOtherValue"}} ) - self.validate_spans() + + expected_db_statement = ( + "update [SON([('q', {'name': 'testName'}), ('u', " + "{'$set': {'value': 'someOtherValue'}}), ('multi', False), ('upsert', False)])]" + ) + self.validate_spans(expected_db_statement) def test_find(self): """Should create a child span for find""" with self._tracer.start_as_current_span("rootSpan"): - self._collection.find_one() - self.validate_spans() + self._collection.find_one({"name": "testName"}) + + expected_db_statement = "find {'name': 'testName'}" + self.validate_spans(expected_db_statement) def test_delete(self): """Should create a child span for delete""" with self._tracer.start_as_current_span("rootSpan"): self._collection.delete_one({"name": "testName"}) - self.validate_spans() + + expected_db_statement = ( + "delete [SON([('q', {'name': 'testName'}), ('limit', 1)])]" + ) + self.validate_spans(expected_db_statement) + + def test_find_without_capture_statement(self): + """Should create a child span for find""" + self.instrumentor._commandtracer_instance.capture_statement = False + + with self._tracer.start_as_current_span("rootSpan"): + self._collection.find_one({"name": "testName"}) + + expected_db_statement = "find" + self.validate_spans(expected_db_statement) def test_uninstrument(self): # check that integration is working