Merge branch 'main' into greenlet-segfault

Author: lrafeei

.github/workflows/get-envs.py

@@ -25,7 +25,9 @@ def main(f):
     filtered_envs = environments[GROUP_NUMBER::TOTAL_GROUPS]
     joined_envs = ",".join(filtered_envs)
 
-    assert joined_envs, f"No environments found.\nenvironments = {str(environments)}\nGROUP_NUMBER = {GROUP_NUMBER + 1}\nTOTAL_GROUPS = {TOTAL_GROUPS}"
+    assert joined_envs, (
+        f"No environments found.\nenvironments = {str(environments)}\nGROUP_NUMBER = {GROUP_NUMBER + 1}\nTOTAL_GROUPS = {TOTAL_GROUPS}"
+    )
     print(joined_envs)
 
 

newrelic/admin/debug_console.py

@@ -14,14 +14,20 @@
 
 from newrelic.admin import command, usage
 
-@command('debug-console', 'config_file [session_log]',
-"""Runs the client for the embedded agent debugging console.
-""", hidden=True, log_intercept=False)
+
+@command(
+    "debug-console",
+    "config_file [session_log]",
+    """Runs the client for the embedded agent debugging console.
+""",
+    hidden=True,
+    log_intercept=False,
+)
 def debug_console(args):
     import sys
 
     if len(args) == 0:
-        usage('debug-console')
+        usage("debug-console")
         sys.exit(1)
 
     from newrelic.console import ClientShell
@@ -30,7 +36,7 @@ def debug_console(args):
     log_object = None
 
     if len(args) >= 2:
-        log_object = open(args[1], 'w')
+        log_object = open(args[1], "w")
 
     shell = ClientShell(config_file, log=log_object)
     shell.cmdloop()

newrelic/admin/generate_config.py

@@ -14,28 +14,31 @@
 
 from newrelic.admin import command, usage
 
-@command('generate-config', 'license_key [output_file]',
-"""Generates a sample agent configuration file for <license_key>.""")
+
+@command(
+    "generate-config", "license_key [output_file]", """Generates a sample agent configuration file for <license_key>."""
+)
 def generate_config(args):
     import os
     import sys
 
     if len(args) == 0:
-        usage('generate-config')
+        usage("generate-config")
         sys.exit(1)
 
     from newrelic import __file__ as package_root
+
     package_root = os.path.dirname(package_root)
 
-    config_file = os.path.join(package_root, 'newrelic.ini')
+    config_file = os.path.join(package_root, "newrelic.ini")
 
-    content = open(config_file, 'r').read()
+    content = open(config_file, "r").read()
 
     if len(args) >= 1:
-        content = content.replace('*** REPLACE ME ***', args[0])
+        content = content.replace("*** REPLACE ME ***", args[0])
 
-    if len(args) >= 2 and args[1] != '-':
-        output_file = open(args[1], 'w')
+    if len(args) >= 2 and args[1] != "-":
+        output_file = open(args[1], "w")
         output_file.write(content)
         output_file.close()
     else:

newrelic/admin/local_config.py

@@ -15,16 +15,19 @@
 from newrelic.admin import command, usage
 
 
-@command('local-config', 'config_file [log_file]',
-"""Dumps out the local agent configuration after having loaded the settings
-from <config_file>.""")
+@command(
+    "local-config",
+    "config_file [log_file]",
+    """Dumps out the local agent configuration after having loaded the settings
+from <config_file>.""",
+)
 def local_config(args):
     import os
     import sys
     import logging
 
     if len(args) == 0:
-        usage('local-config')
+        usage("local-config")
         sys.exit(1)
 
     from newrelic.config import initialize
@@ -33,7 +36,7 @@ def local_config(args):
     if len(args) >= 2:
         log_file = args[1]
     else:
-        log_file = '/tmp/python-agent-test.log'
+        log_file = "/tmp/python-agent-test.log"
 
     log_level = logging.DEBUG
 
@@ -43,13 +46,12 @@ def local_config(args):
         pass
 
     config_file = args[0]
-    environment = os.environ.get('NEW_RELIC_ENVIRONMENT')
+    environment = os.environ.get("NEW_RELIC_ENVIRONMENT")
 
-    if config_file == '-':
-        config_file = os.environ.get('NEW_RELIC_CONFIG_FILE')
+    if config_file == "-":
+        config_file = os.environ.get("NEW_RELIC_CONFIG_FILE")
 
-    initialize(config_file, environment, ignore_errors=False,
-            log_file=log_file, log_level=log_level)
+    initialize(config_file, environment, ignore_errors=False, log_file=log_file, log_level=log_level)
 
     for key, value in sorted(global_settings()):
-        print(f'{key} = {value!r}')
+        print(f"{key} = {value!r}")

newrelic/admin/network_config.py

@@ -15,16 +15,19 @@
 from newrelic.admin import command, usage
 
 
-@command('network-config', 'config_file [log_file]',
-"""Prints out the network configuration after having loaded the settings
-from <config_file>.""")
+@command(
+    "network-config",
+    "config_file [log_file]",
+    """Prints out the network configuration after having loaded the settings
+from <config_file>.""",
+)
 def network_config(args):
     import os
     import sys
     import logging
 
     if len(args) == 0:
-        usage('network-config')
+        usage("network-config")
         sys.exit(1)
 
     from newrelic.config import initialize
@@ -33,7 +36,7 @@ def network_config(args):
     if len(args) >= 2:
         log_file = args[1]
     else:
-        log_file = '/tmp/python-agent-test.log'
+        log_file = "/tmp/python-agent-test.log"
 
     log_level = logging.DEBUG
 
@@ -43,20 +46,19 @@ def network_config(args):
         pass
 
     config_file = args[0]
-    environment = os.environ.get('NEW_RELIC_ENVIRONMENT')
+    environment = os.environ.get("NEW_RELIC_ENVIRONMENT")
 
-    if config_file == '-':
-        config_file = os.environ.get('NEW_RELIC_CONFIG_FILE')
+    if config_file == "-":
+        config_file = os.environ.get("NEW_RELIC_CONFIG_FILE")
 
-    initialize(config_file, environment, ignore_errors=False,
-            log_file=log_file, log_level=log_level)
+    initialize(config_file, environment, ignore_errors=False, log_file=log_file, log_level=log_level)
 
     _settings = global_settings()
 
-    print(f'host = {_settings.host!r}')
-    print(f'port = {_settings.port!r}')
-    print(f'proxy_scheme = {_settings.proxy_scheme!r}')
-    print(f'proxy_host = {_settings.proxy_host!r}')
-    print(f'proxy_port = {_settings.proxy_port!r}')
-    print(f'proxy_user = {_settings.proxy_user!r}')
-    print(f'proxy_pass = {_settings.proxy_pass!r}')
+    print(f"host = {_settings.host!r}")
+    print(f"port = {_settings.port!r}")
+    print(f"proxy_scheme = {_settings.proxy_scheme!r}")
+    print(f"proxy_host = {_settings.proxy_host!r}")
+    print(f"proxy_port = {_settings.proxy_port!r}")
+    print(f"proxy_user = {_settings.proxy_user!r}")
+    print(f"proxy_pass = {_settings.proxy_pass!r}")

newrelic/admin/record_deploy.py

@@ -23,10 +23,7 @@
 
 def fetch_app_id(app_name, client, headers):
     status, data = client.send_request(
-        "GET",
-        "/v2/applications.json",
-        params={"filter[name]": app_name},
-        headers=headers,
+        "GET", "/v2/applications.json", params={"filter[name]": app_name}, headers=headers
     )
 
     if not 200 <= status < 300:
@@ -97,9 +94,7 @@ def record_deploy(
         data = {"deployment": deployment}
         payload = encoding_utils.json_encode(data).encode("utf-8")
 
-        status_code, response = client.send_request(
-            "POST", path, headers=headers, payload=payload
-        )
+        status_code, response = client.send_request("POST", path, headers=headers, payload=payload)
 
         if status_code != 201:
             raise RuntimeError(
@@ -119,9 +114,7 @@ def record_deploy_cmd(args):
         usage("record-deploy")
         sys.exit(1)
 
-    def _args(
-        config_file, description, revision="Unknown", changelog=None, user=None, *args
-    ):
+    def _args(config_file, description, revision="Unknown", changelog=None, user=None, *args):
         return config_file, description, revision, changelog, user
 
     config_file, description, revision, changelog, user = _args(*args)

newrelic/admin/run_program.py

@@ -15,79 +15,79 @@
 from newrelic.admin import command, usage
 
 
-@command('run-program', '...',
-"""Executes the command line but forces the initialisation of the agent
+@command(
+    "run-program",
+    "...",
+    """Executes the command line but forces the initialisation of the agent
 automatically at startup.
 
 If using an agent configuration file the path to the file should be
 supplied by the environment variable NEW_RELIC_CONFIG_FILE. Alternatively,
 just the licence key, application and log file details can be supplied via
 environment variables NEW_RELIC_LICENSE_KEY, NEW_RELIC_APP_NAME and
-NEW_RELIC_LOG.""")
+NEW_RELIC_LOG.""",
+)
 def run_program(args):
     import os
     import sys
     import time
 
     if len(args) == 0:
-        usage('run-program')
+        usage("run-program")
         sys.exit(1)
 
-    startup_debug = os.environ.get('NEW_RELIC_STARTUP_DEBUG',
-            'off').lower() in ('on', 'true', '1')
+    startup_debug = os.environ.get("NEW_RELIC_STARTUP_DEBUG", "off").lower() in ("on", "true", "1")
 
     def log_message(text, *args):
         if startup_debug:
             text = text % args
-            timestamp = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())
-            print(f'NEWRELIC: {timestamp} ({os.getpid()}) - {text}')
+            timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+            print(f"NEWRELIC: {timestamp} ({os.getpid()}) - {text}")
 
-    log_message('New Relic Admin Script (%s)', __file__)
+    log_message("New Relic Admin Script (%s)", __file__)
 
-    log_message('working_directory = %r', os.getcwd())
-    log_message('current_command = %r', sys.argv)
+    log_message("working_directory = %r", os.getcwd())
+    log_message("current_command = %r", sys.argv)
 
-    log_message('sys.prefix = %r', os.path.normpath(sys.prefix))
+    log_message("sys.prefix = %r", os.path.normpath(sys.prefix))
 
     try:
-        log_message('sys.real_prefix = %r', sys.real_prefix)
+        log_message("sys.real_prefix = %r", sys.real_prefix)
     except AttributeError:
         pass
 
-    log_message('sys.version_info = %r', sys.version_info)
-    log_message('sys.executable = %r', sys.executable)
-    log_message('sys.flags = %r', sys.flags)
-    log_message('sys.path = %r', sys.path)
+    log_message("sys.version_info = %r", sys.version_info)
+    log_message("sys.executable = %r", sys.executable)
+    log_message("sys.flags = %r", sys.flags)
+    log_message("sys.path = %r", sys.path)
 
     for name in sorted(os.environ.keys()):
-        if name.startswith('NEW_RELIC_') or name.startswith('PYTHON'):
-            if name == 'NEW_RELIC_LICENSE_KEY':
+        if name.startswith("NEW_RELIC_") or name.startswith("PYTHON"):
+            if name == "NEW_RELIC_LICENSE_KEY":
                 continue
-            log_message('%s = %r', name, os.environ.get(name))
+            log_message("%s = %r", name, os.environ.get(name))
 
     from newrelic import __file__ as root_directory
 
     root_directory = os.path.dirname(root_directory)
-    boot_directory = os.path.join(root_directory, 'bootstrap')
+    boot_directory = os.path.join(root_directory, "bootstrap")
 
-    log_message('root_directory = %r', root_directory)
-    log_message('boot_directory = %r', boot_directory)
+    log_message("root_directory = %r", root_directory)
+    log_message("boot_directory = %r", boot_directory)
 
     python_path = boot_directory
 
-    if 'PYTHONPATH' in os.environ:
-        path = os.environ['PYTHONPATH'].split(os.path.pathsep)
+    if "PYTHONPATH" in os.environ:
+        path = os.environ["PYTHONPATH"].split(os.path.pathsep)
         if boot_directory not in path:
             python_path = f"{boot_directory}{os.path.pathsep}{os.environ['PYTHONPATH']}"
 
-    os.environ['PYTHONPATH'] = python_path
+    os.environ["PYTHONPATH"] = python_path
 
-    os.environ['NEW_RELIC_ADMIN_COMMAND'] = repr(sys.argv)
+    os.environ["NEW_RELIC_ADMIN_COMMAND"] = repr(sys.argv)
 
-    os.environ['NEW_RELIC_PYTHON_PREFIX'] = os.path.realpath(
-            os.path.normpath(sys.prefix))
-    os.environ['NEW_RELIC_PYTHON_VERSION'] = '.'.join(
-            map(str, sys.version_info[:2]))
+    os.environ["NEW_RELIC_PYTHON_PREFIX"] = os.path.realpath(os.path.normpath(sys.prefix))
+    os.environ["NEW_RELIC_PYTHON_VERSION"] = ".".join(map(str, sys.version_info[:2]))
 
     # If not an absolute or relative path, then we need to
     # see if program can be found in PATH. Note that can
@@ -97,14 +97,14 @@ def log_message(text, *args):
     program_exe_path = args[0]
 
     if not os.path.dirname(program_exe_path):
-        program_search_path = os.environ.get('PATH', '').split(os.path.pathsep)
+        program_search_path = os.environ.get("PATH", "").split(os.path.pathsep)
         for path in program_search_path:
             path = os.path.join(path, program_exe_path)
             if os.path.exists(path) and os.access(path, os.X_OK):
                 program_exe_path = path
                 break
 
-    log_message('program_exe_path = %r', program_exe_path)
-    log_message('execl_arguments = %r', [program_exe_path] + args)
+    log_message("program_exe_path = %r", program_exe_path)
+    log_message("execl_arguments = %r", [program_exe_path] + args)
 
     os.execl(program_exe_path, *args)