Merge branch 'main' into add-mcp-instrumentation

Author: mergify[bot]

.github/workflows/build-ci-image.yml

@@ -59,7 +59,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and Publish Image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # 6.16.0
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # 6.17.0
         with:
           push: ${{ github.event_name != 'pull_request' }}
           context: .github/containers

.github/workflows/tests.yml

@@ -96,7 +96,7 @@ jobs:
           coverage xml
 
       - name: Upload Coverage to Codecov
-        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # 5.4.2
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # 5.4.3
         with:
           files: coverage.xml
           fail_ci_if_error: true

.github/workflows/trivy.yml

@@ -56,6 +56,6 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: ${{ github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # 3.28.17
+        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # 3.28.18
         with:
           sarif_file: "trivy-results.sarif"

newrelic/__init__.py

@@ -17,7 +17,7 @@
 THIS_DIR = os.path.dirname(__file__)
 
 try:
-    with open(os.path.join(THIS_DIR, "version.txt"), "r") as f:
+    with open(os.path.join(THIS_DIR, "version.txt")) as f:
         version = f.read()
 except:
     version = "0.0.0"

newrelic/admin/generate_config.py

@@ -32,7 +32,8 @@ def generate_config(args):
 
     config_file = os.path.join(package_root, "newrelic.ini")
 
-    content = open(config_file, "r").read()
+    with open(config_file) as f:
+        content = f.read()
 
     if len(args) >= 1:
         content = content.replace("*** REPLACE ME ***", args[0])

newrelic/api/asgi_application.py

@@ -209,7 +209,7 @@ def __init__(self, application, scope, receive, send, source=None):
         request_path = scope["path"]
         query_string = scope["query_string"]
         headers = scope["headers"] = tuple(scope["headers"])
-        super(ASGIWebTransaction, self).__init__(
+        super().__init__(
             application=application,
             name=None,
             scheme=scheme,

newrelic/api/background_task.py

@@ -25,7 +25,7 @@ class BackgroundTask(Transaction):
     def __init__(self, application, name, group=None, source=None):
         # Initialise the common transaction base class.
 
-        super(BackgroundTask, self).__init__(application, source=source)
+        super().__init__(application, source=source)
 
         # Mark this as a background task even if disabled.
 

newrelic/api/cat_header_mixin.py

@@ -34,7 +34,7 @@ class CatHeaderMixin:
     settings = None
 
     def __enter__(self):
-        result = super(CatHeaderMixin, self).__enter__()
+        result = super().__enter__()
         if result is self and self.transaction:
             self.settings = self.transaction.settings or None
         return result

newrelic/api/database_trace.py

@@ -69,7 +69,7 @@ def __init__(
         if kwargs:
             raise TypeError("Invalid keyword arguments:", kwargs)
 
-        super(DatabaseTrace, self).__init__(parent=parent, source=source)
+        super().__init__(parent=parent, source=source)
 
         self.sql = sql
 
@@ -84,7 +84,7 @@ def __init__(
         self.database_name = database_name
 
     def __enter__(self):
-        result = super(DatabaseTrace, self).__enter__()
+        result = super().__enter__()
         if result and self.transaction:
             self.sql = self.transaction._intern_string(self.sql)
         return result

newrelic/api/datastore_trace.py

@@ -61,7 +61,7 @@ def __init__(self, product, target, operation, host=None, port_path_or_id=None,
         if kwargs:
             raise TypeError("Invalid keyword arguments:", kwargs)
 
-        super(DatastoreTrace, self).__init__(parent=parent, source=source)
+        super().__init__(parent=parent, source=source)
 
         self.instance_reporting_enabled = False
         self.database_name_enabled = False
@@ -75,7 +75,7 @@ def __init__(self, product, target, operation, host=None, port_path_or_id=None,
         self.database_name = database_name
 
     def __enter__(self):
-        result = super(DatastoreTrace, self).__enter__()
+        result = super().__enter__()
         if result and self.transaction:
             transaction = self.transaction