Merge branch 'main' into celery-custom-task-instrumentation

Author: lrafeei

.github/workflows/deploy-python.yml renamed to .github/workflows/deploy.yml

@@ -19,6 +19,9 @@ on:
     types:
       - published
 
+permissions:
+  contents: read
+
 jobs:
   build-linux-py3-legacy:
     runs-on: ubuntu-24.04
@@ -110,18 +113,22 @@ jobs:
           persist-credentials: false
           fetch-depth: 0
 
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # 5.6.0
+        with:
+          python-version: "3.12"
+
       - name: Install Dependencies
         run: |
           pip install -U pip
-          pip install -U setuptools packaging
+          pip install -U build
 
       - name: Build Source Package
         run: |
-          python setup.py sdist
+          python -m build --sdist
 
       - name: Prepare MD5 Hash File
         run: |
-          tarball="$(python setup.py --fullname).tar.gz"
+          tarball="$(basename ./dist/*.tar.gz)"
           md5_file="${tarball}.md5"
           openssl md5 -binary "dist/${tarball}" | xxd -p | tr -d '\n' > "dist/${md5_file}"
 
@@ -135,58 +142,46 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
-  deploy:
+  publish:
     runs-on: ubuntu-24.04
+    environment: pypi
+    permissions:
+      contents: read
+      id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
+      attestations: write
 
     needs:
       - build-linux-py3-legacy
       - build-linux-py3
       - build-sdist
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
-        with:
-          persist-credentials: false
-          fetch-depth: 0
-
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # 5.6.0
-        with:
-          python-version: "3.x"
-          architecture: x64
-
-      - name: Install Dependencies
-        run: |
-          pip install -U pip
-          pip install -U wheel setuptools packaging twine
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0@95815c38cf2ff2164869cbab79da8d1f422bc89e # 4.3.0
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0
         with:
-          path: ./artifacts/
-
-      - name: Unpack Artifacts
-        run: |
-          mkdir -p dist/
-          mv artifacts/**/*{.whl,.tar.gz,.tar.gz.md5} dist/
+          path: ./dist/
+          merge-multiple: true
 
       - name: Upload Package to S3
         run: |
-          tarball="$(python setup.py --fullname).tar.gz"
+          tarball="$(basename ./dist/*.tar.gz)"
           md5_file="${tarball}.md5"
           aws s3 cp "dist/${md5_file}" "${S3_DST}/${md5_file}"
           aws s3 cp "dist/${tarball}" "${S3_DST}/${tarball}"
+          rm "dist/${md5_file}"
         env:
           S3_DST: s3://nr-downloads-main/python_agent/release
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: us-west-2
 
-      - name: Upload Package to PyPI
-        run: |
-          twine upload --non-interactive dist/*.tar.gz dist/*.whl
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+      - name: Upload Package
+        uses: pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc # 1.12.4
+
+      - name: Attest
+        uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # 2.3.0
+        id: attest
+        with:
+          subject-path: ./dist/*
 
       - name: Wait for release to be available
         id: wait

.github/workflows/tests.yml

@@ -44,6 +44,7 @@ jobs:
       - firestore
       - grpc
       - kafka
+      - oracledb
       - memcached
       - mongodb3
       - mongodb8
@@ -800,6 +801,73 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
+  oracledb:
+    env:
+      TOTAL_GROUPS: 1
+
+    strategy:
+      fail-fast: false
+      matrix:
+        group-number: [1]
+
+    runs-on: ubuntu-24.04
+    container:
+      image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
+      options: >-
+        --add-host=host.docker.internal:host-gateway
+    timeout-minutes: 30
+    services:
+      oracledb:
+        image: container-registry.oracle.com/database/free:latest-lite
+        ports:
+          - 8080:1521
+          - 8081:1521
+        env:
+          ORACLE_CHARACTERSET: utf8
+          ORACLE_PWD: oracle
+        # Set health checks to wait until container has started
+        options: >-
+          --health-cmd "timeout 5 bash -c 'cat < /dev/null > /dev/udp/127.0.0.1/11211'"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+
+      - name: Fetch git tags
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git fetch --tags origin
+
+      - name: Configure pip cache
+        run: |
+          mkdir -p /github/home/.cache/pip
+          chown -R "$(whoami)" /github/home/.cache/pip
+
+      - name: Get Environments
+        id: get-envs
+        run: |
+          echo "envs=$(tox -l | grep '^${{ github.job }}\-' | ./.github/workflows/get-envs.py)" >> "$GITHUB_OUTPUT"
+        env:
+          GROUP_NUMBER: ${{ matrix.group-number }}
+
+      - name: Test
+        run: |
+          tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
+        env:
+          TOX_PARALLEL_NO_SPINNER: 1
+          PY_COLORS: 0
+
+      - name: Upload Coverage Artifacts
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
+        with:
+          name: coverage-${{ github.job }}-${{ strategy.job-index }}
+          path: ./**/.coverage.*
+          include-hidden-files: true
+          if-no-files-found: error
+          retention-days: 1
+
   memcached:
     env:
       TOTAL_GROUPS: 2

README.md

@@ -44,7 +44,7 @@ pip install newrelic
 Start](https://docs.newrelic.com/docs/agents/python-agent/getting-started/python-agent-quick-start).)
 
 1. Generate the agent configuration file with your [license
-    key](https://docs.newrelic.com/docs/accounts-partnerships/accounts/account-setup/license-key).
+    key](https://docs.newrelic.com/docs/apis/intro-apis/new-relic-api-keys/).
 
     ```bash
     newrelic-admin generate-config $YOUR_LICENSE_KEY newrelic.ini

newrelic/api/message_transaction.py

@@ -55,6 +55,7 @@ def __init__(
         self.routing_key = routing_key
         self.exchange_type = exchange_type
         self.queue_name = queue_name
+        self.destination_name = destination_name
         self.reply_to = reply_to
         self.correlation_id = correlation_id
 

newrelic/config.py

@@ -2878,6 +2878,8 @@ def _process_module_builtin_defaults():
 
     _process_module_definition("cx_Oracle", "newrelic.hooks.database_cx_oracle", "instrument_cx_oracle")
 
+    _process_module_definition("oracledb", "newrelic.hooks.database_oracledb", "instrument_oracledb")
+
     _process_module_definition("ibm_db_dbi", "newrelic.hooks.database_ibm_db_dbi", "instrument_ibm_db_dbi")
 
     _process_module_definition("mysql.connector", "newrelic.hooks.database_mysql", "instrument_mysql_connector")

newrelic/hooks/database_oracledb.py

@@ -0,0 +1,143 @@
+# Copyright 2010 New Relic, Inc.
+#
+# 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.
+
+from newrelic.api.database_trace import register_database_client
+from newrelic.common.object_wrapper import wrap_object
+from newrelic.hooks.database_dbapi2 import ConnectionFactory as DBAPI2ConnectionFactory
+from newrelic.hooks.database_dbapi2 import ConnectionWrapper as DBAPI2ConnectionWrapper
+from newrelic.hooks.database_dbapi2 import CursorWrapper as DBAPI2CursorWrapper
+from newrelic.hooks.database_dbapi2_async import AsyncConnectionFactory as DBAPI2AsyncConnectionFactory
+from newrelic.hooks.database_dbapi2_async import AsyncConnectionWrapper as DBAPI2AsyncConnectionWrapper
+from newrelic.hooks.database_dbapi2_async import AsyncCursorWrapper as DBAPI2AsyncCursorWrapper
+
+
+class CursorWrapper(DBAPI2CursorWrapper):
+    def __enter__(self):
+        self.__wrapped__.__enter__()
+        return self
+
+
+class ConnectionWrapper(DBAPI2ConnectionWrapper):
+    __cursor_wrapper__ = CursorWrapper
+
+    def __enter__(self):
+        self.__wrapped__.__enter__()
+        return self
+
+
+class ConnectionFactory(DBAPI2ConnectionFactory):
+    __connection_wrapper__ = ConnectionWrapper
+
+
+class AsyncCursorWrapper(DBAPI2AsyncCursorWrapper):
+    async def __aenter__(self):
+        await self.__wrapped__.__aenter__()
+        return self
+
+
+class AsyncConnectionWrapper(DBAPI2AsyncConnectionWrapper):
+    __cursor_wrapper__ = AsyncCursorWrapper
+
+    async def __aenter__(self):
+        await self.__wrapped__.__aenter__()
+        return self
+
+    def __await__(self):
+        # Handle bidirectional generator protocol using code from generator_wrapper
+        g = self.__wrapped__.__await__()
+        try:
+            yielded = g.send(None)
+            while True:
+                try:
+                    sent = yield yielded
+                except GeneratorExit:
+                    g.close()
+                    raise
+                except BaseException as e:
+                    yielded = g.throw(e)
+                else:
+                    yielded = g.send(sent)
+        except StopIteration as e:
+            # Catch the StopIteration and return the wrapped connection instead of the unwrapped.
+            if e.value is self.__wrapped__:
+                connection = self
+            else:
+                connection = e.value
+
+            # Return here instead of raising StopIteration to properly follow generator protocol
+            return connection
+
+
+class AsyncConnectionFactory(DBAPI2AsyncConnectionFactory):
+    __connection_wrapper__ = AsyncConnectionWrapper
+
+    # Use the synchronous __call__ method as connection_async() is synchronous in oracledb.
+    __call__ = DBAPI2ConnectionFactory.__call__
+
+
+def instance_info(args, kwargs):
+    from oracledb import ConnectParams
+
+    dsn = args[0] if args else None
+
+    host = None
+    port = None
+    service_name = None
+
+    params_from_kwarg = kwargs.pop("params", None)
+
+    params_from_dsn = None
+    if dsn:
+        try:
+            params_from_dsn = ConnectParams()
+            if "@" in dsn:
+                _, _, connect_string = params_from_dsn.parse_dsn_with_credentials(dsn)
+            else:
+                connect_string = dsn
+            params_from_dsn.parse_connect_string(connect_string)
+        except Exception:
+            params_from_dsn = None
+
+    host = (
+        getattr(params_from_kwarg, "host", None)
+        or kwargs.get("host", None)
+        or getattr(params_from_dsn, "host", None)
+        or "unknown"
+    )
+    port = str(
+        getattr(params_from_kwarg, "port", None)
+        or kwargs.get("port", None)
+        or getattr(params_from_dsn, "port", None)
+        or "1521"
+    )
+    service_name = (
+        getattr(params_from_kwarg, "service_name", None)
+        or kwargs.get("service_name", None)
+        or getattr(params_from_dsn, "service_name", None)
+        or "unknown"
+    )
+
+    return host, port, service_name
+
+
+def instrument_oracledb(module):
+    register_database_client(
+        module, database_product="Oracle", quoting_style="single+oracle", instance_info=instance_info
+    )
+
+    if hasattr(module, "connect"):
+        wrap_object(module, "connect", ConnectionFactory, (module,))
+
+    if hasattr(module, "connect_async"):
+        wrap_object(module, "connect_async", AsyncConnectionFactory, (module,))

newrelic/hooks/messagebroker_kombu.py

@@ -194,7 +194,6 @@ def wrap_consumer_recieve_callback(wrapped, instance, args, kwargs):
                 source=wrapped,
             )
             created_transaction.__enter__()
-            created_transaction.destination_name = destination_name
 
             # Obtain consumer client_id to send up as agent attribute
             if hasattr(message, "channel") and hasattr(message.channel, "channel_id"):