Skip to content

Commit 4f7c555

Browse files
umaannamalaiumaannamalai
committed
Merge branch 'llm-custom-attrs-api' of github.com:newrelic/newrelic-python-agent into llm-custom-attrs-api
2 parents beeb67f + 6edffd1 commit 4f7c555

24 files changed

+154
-147
lines changed

‎.github/workflows/deploy-python.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
- cp311-musllinux
3838
- cp312-manylinux
3939
- cp312-musllinux
40+
- cp313-manylinux
41+
- cp313-musllinux
4042

4143
steps:
4244
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1
@@ -48,7 +50,7 @@ jobs:
4850
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # 3.0.0
4951

5052
- name: Build Wheels
51-
uses: pypa/cibuildwheel@8d945475ac4b1aac4ae08b2fd27db9917158b6ce # 2.17.0
53+
uses: pypa/cibuildwheel@d4a2945fcc8d13f20a1b99d461b8e844d5fc6e23 # 2.21.1
5254
env:
5355
CIBW_PLATFORM: linux
5456
CIBW_BUILD: "${{ matrix.wheel }}*"

‎newrelic/agent.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ def __asgi_application(*args, **kwargs):
139139
from newrelic.api.html_insertion import verify_body_exists as __verify_body_exists
140140
from newrelic.api.lambda_handler import LambdaHandlerWrapper as __LambdaHandlerWrapper
141141
from newrelic.api.lambda_handler import lambda_handler as __lambda_handler
142+
from newrelic.api.llm_custom_attributes import (
143+
WithLlmCustomAttributes as __WithLlmCustomAttributes,
144+
)
142145
from newrelic.api.message_trace import MessageTrace as __MessageTrace
143146
from newrelic.api.message_trace import MessageTraceWrapper as __MessageTraceWrapper
144147
from newrelic.api.message_trace import message_trace as __message_trace
@@ -156,9 +159,10 @@ def __asgi_application(*args, **kwargs):
156159
from newrelic.api.ml_model import (
157160
record_llm_feedback_event as __record_llm_feedback_event,
158161
)
159-
from newrelic.api.ml_model import set_llm_token_count_callback as __set_llm_token_count_callback
162+
from newrelic.api.ml_model import (
163+
set_llm_token_count_callback as __set_llm_token_count_callback,
164+
)
160165
from newrelic.api.ml_model import wrap_mlmodel as __wrap_mlmodel
161-
from newrelic.api.llm_custom_attributes import WithLlmCustomAttributes as __WithLlmCustomAttributes
162166
from newrelic.api.profile_trace import ProfileTraceWrapper as __ProfileTraceWrapper
163167
from newrelic.api.profile_trace import profile_trace as __profile_trace
164168
from newrelic.api.profile_trace import wrap_profile_trace as __wrap_profile_trace

‎newrelic/api/llm_custom_attributes.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# limitations under the License.
1414

1515
import logging
16+
1617
from newrelic.api.transaction import current_transaction
1718

1819
_logger = logging.getLogger(__name__)
@@ -22,7 +23,9 @@ class WithLlmCustomAttributes(object):
2223
def __init__(self, custom_attr_dict):
2324
transaction = current_transaction()
2425
if not custom_attr_dict or not isinstance(custom_attr_dict, dict):
25-
raise TypeError("custom_attr_dict must be a non-empty dictionary. Received type: %s" % type(custom_attr_dict))
26+
raise TypeError(
27+
"custom_attr_dict must be a non-empty dictionary. Received type: %s" % type(custom_attr_dict)
28+
)
2629

2730
# Add "llm." prefix to all keys in attribute dictionary
2831
context_attrs = {k if k.startswith("llm.") else f"llm.{k}": v for k, v in custom_attr_dict.items()}

‎newrelic/common/_monotonic.c‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ static PyMethodDef monotonic_methods[] = {
121121
{ NULL, NULL }
122122
};
123123

124-
#if PY_MAJOR_VERSION >= 3
125124
static struct PyModuleDef moduledef = {
126125
PyModuleDef_HEAD_INIT,
127126
"_monotonic", /* m_name */
@@ -133,36 +132,24 @@ static struct PyModuleDef moduledef = {
133132
NULL, /* m_clear */
134133
NULL, /* m_free */
135134
};
136-
#endif
137135

138136
static PyObject *
139137
moduleinit(void)
140138
{
141139
PyObject *module;
142140

143-
#if PY_MAJOR_VERSION >= 3
144141
module = PyModule_Create(&moduledef);
145-
#else
146-
module = Py_InitModule3("_monotonic", monotonic_methods, NULL);
147-
#endif
148142

149143
if (module == NULL)
150144
return NULL;
151145

152146
return module;
153147
}
154148

155-
#if PY_MAJOR_VERSION < 3
156-
PyMODINIT_FUNC init_monotonic(void)
157-
{
158-
moduleinit();
159-
}
160-
#else
161149
PyMODINIT_FUNC PyInit__monotonic(void)
162150
{
163151
return moduleinit();
164152
}
165-
#endif
166153

167154
/* ------------------------------------------------------------------------- */
168155

‎newrelic/core/_thread_utilization.c‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
/* ------------------------------------------------------------------------- */
1818

19+
#include <sys/time.h>
1920
#include <Python.h>
20-
2121
#include <pythread.h>
2222

2323
#ifndef PyVarObject_HEAD_INIT
@@ -254,14 +254,10 @@ static PyObject *NRUtilization_enter(NRUtilizationObject *self, PyObject *args)
254254
PyObject *func = NULL;
255255

256256
dict = PyModule_GetDict(module);
257-
#if PY_MAJOR_VERSION >= 3
258257
func = PyDict_GetItemString(dict, "current_thread");
259-
#else
260-
func = PyDict_GetItemString(dict, "currentThread");
261-
#endif
262258
if (func) {
263259
Py_INCREF(func);
264-
thread = PyEval_CallObject(func, (PyObject *)NULL);
260+
thread = PyObject_Call(func, (PyObject *)NULL, (PyObject *)NULL);
265261
if (!thread)
266262
PyErr_Clear();
267263

@@ -408,7 +404,6 @@ PyTypeObject NRUtilization_Type = {
408404

409405
/* ------------------------------------------------------------------------- */
410406

411-
#if PY_MAJOR_VERSION >= 3
412407
static struct PyModuleDef moduledef = {
413408
PyModuleDef_HEAD_INIT,
414409
"_thread_utilization", /* m_name */
@@ -420,18 +415,13 @@ static struct PyModuleDef moduledef = {
420415
NULL, /* m_clear */
421416
NULL, /* m_free */
422417
};
423-
#endif
424418

425419
static PyObject *
426420
moduleinit(void)
427421
{
428422
PyObject *module;
429423

430-
#if PY_MAJOR_VERSION >= 3
431424
module = PyModule_Create(&moduledef);
432-
#else
433-
module = Py_InitModule3("_thread_utilization", NULL, NULL);
434-
#endif
435425

436426
if (module == NULL)
437427
return NULL;
@@ -446,16 +436,9 @@ moduleinit(void)
446436
return module;
447437
}
448438

449-
#if PY_MAJOR_VERSION < 3
450-
PyMODINIT_FUNC init_thread_utilization(void)
451-
{
452-
moduleinit();
453-
}
454-
#else
455439
PyMODINIT_FUNC PyInit__thread_utilization(void)
456440
{
457441
return moduleinit();
458442
}
459-
#endif
460443

461444
/* ------------------------------------------------------------------------- */

‎newrelic/hooks/mlmodel_langchain.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,7 @@ def _record_tool_success(
452452
try:
453453
result = str(response)
454454
except Exception:
455-
_logger.debug(
456-
f"Failed to convert tool response into a string.\n{traceback.format_exception(*sys.exc_info())}"
457-
)
455+
_logger.debug(f"Failed to convert tool response into a string.\n{traceback.format_exception(*sys.exc_info())}")
458456
if settings.ai_monitoring.record_content.enabled:
459457
full_tool_event_dict.update(
460458
{

‎setup.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161

6262

6363
def newrelic_agent_guess_next_version(tag_version):
64+
if hasattr(tag_version, "tag"): # For setuptools_scm 7.0+
65+
tag_version = tag_version.tag
66+
6467
version, _, _ = str(tag_version).partition("+")
6568
version_info = list(map(int, version.split(".")))
6669
if len(version_info) < 3:
@@ -142,6 +145,7 @@ def build_extension(self, ext):
142145
"Programming Language :: Python :: 3.10",
143146
"Programming Language :: Python :: 3.11",
144147
"Programming Language :: Python :: 3.12",
148+
"Programming Language :: Python :: 3.13",
145149
"Programming Language :: Python :: Implementation :: CPython",
146150
"Programming Language :: Python :: Implementation :: PyPy",
147151
"Topic :: System :: Monitoring",
@@ -155,7 +159,7 @@ def build_extension(self, ext):
155159
"git_describe_command": "git describe --dirty --tags --long --match *.*.*",
156160
"write_to": "newrelic/version.txt",
157161
},
158-
setup_requires=["setuptools_scm>=3.2,<7"],
162+
setup_requires=["setuptools_scm>=3.2,<9"],
159163
description="New Relic Python Agent",
160164
long_description=open(readme_file).read(),
161165
url="https://docs.newrelic.com/docs/apm/agents/python-agent/",

‎tests/agent_features/test_llm_custom_attributes.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Copyright 2010 New Relic, Inc.
32
#
43
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +15,8 @@
1615
import pytest
1716

1817
from newrelic.api.background_task import background_task
19-
from newrelic.api.transaction import current_transaction
2018
from newrelic.api.llm_custom_attributes import WithLlmCustomAttributes
19+
from newrelic.api.transaction import current_transaction
2120

2221

2322
@background_task()

‎tests/agent_unittests/test_full_uri_payloads.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
from testing_support.fixtures import collector_agent_registration_fixture
2121
from newrelic.core.agent_protocol import AgentProtocol
2222
from newrelic.common.agent_http import HttpClient
23-
from newrelic.core.config import global_settings
23+
from newrelic.core.config import global_settings, _environ_as_bool
24+
25+
DEVELOPER_MODE = _environ_as_bool("NEW_RELIC_DEVELOPER_MODE", False) or "NEW_RELIC_LICENSE_KEY" not in os.environ
26+
SKIP_IF_DEVELOPER_MODE = pytest.mark.skipif(DEVELOPER_MODE, reason="Cannot connect to collector in developer mode")
2427

2528

2629
class FullUriClient(HttpClient):
@@ -55,10 +58,7 @@ def session(application):
5558
}
5659

5760

58-
@pytest.mark.skipif(
59-
"NEW_RELIC_LICENSE_KEY" not in os.environ,
60-
reason="License key is not expected to be valid",
61-
)
61+
@SKIP_IF_DEVELOPER_MODE
6262
@pytest.mark.parametrize(
6363
"method,payload",
6464
[
@@ -86,10 +86,7 @@ def test_full_uri_payload(session, method, payload):
8686
protocol.send(method, payload)
8787

8888

89-
@pytest.mark.skipif(
90-
"NEW_RELIC_LICENSE_KEY" not in os.environ,
91-
reason="License key is not expected to be valid",
92-
)
89+
@SKIP_IF_DEVELOPER_MODE
9390
def test_full_uri_connect():
9491
# An exception will be raised here if there's a problem with the response
9592
AgentProtocol.connect(

‎tests/datastore_aiomcache/test_aiomcache.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@
2323

2424
from newrelic.api.background_task import background_task
2525
from newrelic.api.transaction import set_background_task
26+
from newrelic.common import system_info
2627

2728
DB_SETTINGS = memcached_settings()[0]
2829

2930
MEMCACHED_HOST = DB_SETTINGS["host"]
3031
MEMCACHED_PORT = DB_SETTINGS["port"]
3132
MEMCACHED_NAMESPACE = str(os.getpid())
32-
INSTANCE_METRIC_NAME = f"Datastore/instance/Memcached/{MEMCACHED_HOST}/{MEMCACHED_PORT}"
33+
INSTANCE_METRIC_HOST = system_info.gethostname() if MEMCACHED_HOST == "127.0.0.1" else MEMCACHED_HOST
34+
INSTANCE_METRIC_NAME = f"Datastore/instance/Memcached/{INSTANCE_METRIC_HOST}/{MEMCACHED_PORT}"
3335

3436
_test_bt_set_get_delete_scoped_metrics = [
3537
("Datastore/operation/Memcached/set", 1),

0 commit comments

Comments
 (0)