Merge remote-tracking branch 'origin/main' into feat-free-threaded-python

Author: TimPansino

.github/workflows/deploy.yml

@@ -89,7 +89,7 @@ jobs:
           platforms: arm64
 
       - name: Build Wheels
-        uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # 2.23.3
+        uses: pypa/cibuildwheel@9c00cb4f6b517705a3794b22395aedc36257242c # 3.2.1
         env:
           CIBW_PLATFORM: auto
           CIBW_BUILD: "${{ matrix.wheel }}*"

.github/workflows/tests.yml

@@ -374,8 +374,12 @@ jobs:
 
       - name: Install Python
         run: |
-          uv python install -f 3.13 3.14 3.14t
-          uv python install -f --default 3.13
+          uv python install -f \
+            cpython-3.13-windows-aarch64-none \
+            cpython-3.14-windows-aarch64-none \
+            cpython-3.14t-windows-aarch64-none
+          uv python install -f --default \
+            cpython-3.13-windows-aarch64-none
 
       - name: Install Dependencies
         run: |

.github/workflows/trivy.yml

@@ -61,6 +61,6 @@ jobs:
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: ${{ github.event_name == 'schedule' }}
-        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # 4.31.0
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # 4.31.2
         with:
           sarif_file: "trivy-results.sarif"

newrelic/core/config.py

@@ -803,9 +803,9 @@ def default_otlp_host(host):
 _settings.compressed_content_encoding = "gzip"
 _settings.max_payload_size_in_bytes = 1000000
 
-_settings.attributes.enabled = True
-_settings.attributes.exclude = []
-_settings.attributes.include = []
+_settings.attributes.enabled = _environ_as_bool("NEW_RELIC_ATTRIBUTES_ENABLED", default=True)
+_settings.attributes.exclude = _environ_as_set(os.environ.get("NEW_RELIC_ATTRIBUTES_EXCLUDE", ""))
+_settings.attributes.include = _environ_as_set(os.environ.get("NEW_RELIC_ATTRIBUTES_INCLUDE", ""))
 
 _settings.thread_profiler.enabled = True
 _settings.cross_application_tracer.enabled = False
@@ -821,9 +821,15 @@ def default_otlp_host(host):
 _settings.event_harvest_config.harvest_limits.analytic_event_data = _environ_as_int(
     "NEW_RELIC_ANALYTICS_EVENTS_MAX_SAMPLES_STORED", default=DEFAULT_RESERVOIR_SIZE
 )
-_settings.transaction_events.attributes.enabled = True
-_settings.transaction_events.attributes.exclude = []
-_settings.transaction_events.attributes.include = []
+_settings.transaction_events.attributes.enabled = _environ_as_bool(
+    "NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_ENABLED", default=True
+)
+_settings.transaction_events.attributes.exclude = _environ_as_set(
+    os.environ.get("NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_EXCLUDE", "")
+)
+_settings.transaction_events.attributes.include = _environ_as_set(
+    os.environ.get("NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_INCLUDE", "")
+)
 
 _settings.custom_insights_events.enabled = True
 _settings.event_harvest_config.harvest_limits.custom_event_data = _environ_as_int(
@@ -847,13 +853,23 @@ def default_otlp_host(host):
 _settings.event_harvest_config.harvest_limits.span_event_data = _environ_as_int(
     "NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED", default=SPAN_EVENT_RESERVOIR_SIZE
 )
-_settings.span_events.attributes.enabled = True
-_settings.span_events.attributes.exclude = []
-_settings.span_events.attributes.include = []
+_settings.span_events.attributes.enabled = _environ_as_bool("NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_ENABLED", default=True)
+_settings.span_events.attributes.exclude = _environ_as_set(
+    os.environ.get("NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_EXCLUDE", "")
+)
+_settings.span_events.attributes.include = _environ_as_set(
+    os.environ.get("NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_INCLUDE", "")
+)
 
-_settings.transaction_segments.attributes.enabled = True
-_settings.transaction_segments.attributes.exclude = []
-_settings.transaction_segments.attributes.include = []
+_settings.transaction_segments.attributes.enabled = _environ_as_bool(
+    "NEW_RELIC_TRANSACTION_SEGMENTS_ATTRIBUTES_ENABLED", default=True
+)
+_settings.transaction_segments.attributes.exclude = _environ_as_set(
+    os.environ.get("NEW_RELIC_TRANSACTION_SEGMENTS_ATTRIBUTES_EXCLUDE", "")
+)
+_settings.transaction_segments.attributes.include = _environ_as_set(
+    os.environ.get("NEW_RELIC_TRANSACTION_SEGMENTS_ATTRIBUTES_INCLUDE", "")
+)
 
 _settings.transaction_tracer.enabled = True
 _settings.transaction_tracer.transaction_threshold = None
@@ -864,9 +880,15 @@ def default_otlp_host(host):
 _settings.transaction_tracer.function_trace = []
 _settings.transaction_tracer.generator_trace = []
 _settings.transaction_tracer.top_n = 20
-_settings.transaction_tracer.attributes.enabled = True
-_settings.transaction_tracer.attributes.exclude = []
-_settings.transaction_tracer.attributes.include = []
+_settings.transaction_tracer.attributes.enabled = _environ_as_bool(
+    "NEW_RELIC_TRANSACTION_TRACER_ATTRIBUTES_ENABLED", default=True
+)
+_settings.transaction_tracer.attributes.exclude = _environ_as_set(
+    os.environ.get("NEW_RELIC_TRANSACTION_TRACER_ATTRIBUTES_EXCLUDE", "")
+)
+_settings.transaction_tracer.attributes.include = _environ_as_set(
+    os.environ.get("NEW_RELIC_TRANSACTION_TRACER_ATTRIBUTES_INCLUDE", "")
+)
 
 _settings.error_collector.enabled = True
 _settings.error_collector.capture_events = True
@@ -879,9 +901,15 @@ def default_otlp_host(host):
 )
 _settings.error_collector.expected_status_codes = set()
 _settings.error_collector._error_group_callback = None
-_settings.error_collector.attributes.enabled = True
-_settings.error_collector.attributes.exclude = []
-_settings.error_collector.attributes.include = []
+_settings.error_collector.attributes.enabled = _environ_as_bool(
+    "NEW_RELIC_ERROR_COLLECTOR_ATTRIBUTES_ENABLED", default=True
+)
+_settings.error_collector.attributes.exclude = _environ_as_set(
+    os.environ.get("NEW_RELIC_ERROR_COLLECTOR_ATTRIBUTES_EXCLUDE", "")
+)
+_settings.error_collector.attributes.include = _environ_as_set(
+    os.environ.get("NEW_RELIC_ERROR_COLLECTOR_ATTRIBUTES_INCLUDE", "")
+)
 
 _settings.browser_monitoring.enabled = True
 _settings.browser_monitoring.auto_instrument = True
@@ -890,9 +918,15 @@ def default_otlp_host(host):
 _settings.browser_monitoring.debug = False
 _settings.browser_monitoring.ssl_for_http = None
 _settings.browser_monitoring.content_type = ["text/html"]
-_settings.browser_monitoring.attributes.enabled = False
-_settings.browser_monitoring.attributes.exclude = []
-_settings.browser_monitoring.attributes.include = []
+_settings.browser_monitoring.attributes.enabled = _environ_as_bool(
+    "NEW_RELIC_BROWSER_MONITORING_ATTRIBUTES_ENABLED", default=False
+)
+_settings.browser_monitoring.attributes.exclude = _environ_as_set(
+    os.environ.get("NEW_RELIC_BROWSER_MONITORING_ATTRIBUTES_EXCLUDE", "")
+)
+_settings.browser_monitoring.attributes.include = _environ_as_set(
+    os.environ.get("NEW_RELIC_BROWSER_MONITORING_ATTRIBUTES_INCLUDE", "")
+)
 
 _settings.transaction_name.limit = None
 _settings.transaction_name.naming_scheme = os.environ.get("NEW_RELIC_TRANSACTION_NAMING_SCHEME")

newrelic/hooks/external_botocore.py

@@ -394,7 +394,7 @@ def extract_bedrock_claude_model_request(request_body, bedrock_attrs):
         ]
     else:
         input_message_list = [{"role": "user", "content": request_body.get("prompt")}]
-    bedrock_attrs["request.max_tokens"] = request_body.get("max_tokens_to_sample")
+    bedrock_attrs["request.max_tokens"] = request_body.get("max_tokens_to_sample") or request_body.get("max_tokens")
     bedrock_attrs["request.temperature"] = request_body.get("temperature")
     bedrock_attrs["input_message_list"] = input_message_list
 
@@ -406,7 +406,13 @@ def extract_bedrock_claude_model_response(response_body, bedrock_attrs):
         response_body = json.loads(response_body)
         role = response_body.get("role", "assistant")
         content = response_body.get("content") or response_body.get("completion")
-        output_message_list = [{"role": role, "content": content}]
+
+        # For Claude Sonnet 3+ models, the content key holds a list with the type and text of the output
+        if isinstance(content, list):
+            output_message_list = [{"role": "assistant", "content": result.get("text")} for result in content]
+        else:
+            output_message_list = [{"role": role, "content": content}]
+
         bedrock_attrs["response.choices.finish_reason"] = response_body.get("stop_reason")
         bedrock_attrs["output_message_list"] = output_message_list
 
@@ -420,6 +426,7 @@ def extract_bedrock_claude_model_streaming_response(response_body, bedrock_attrs
             bedrock_attrs["output_message_list"] = [{"role": "assistant", "content": ""}]
         bedrock_attrs["output_message_list"][0]["content"] += content
         bedrock_attrs["response.choices.finish_reason"] = response_body.get("stop_reason")
+
     return bedrock_attrs
 
 
@@ -639,7 +646,7 @@ def _wrap_bedrock_runtime_invoke_model(wrapped, instance, args, kwargs):
 
         # Determine extractor by model type
         for extractor_name, request_extractor, response_extractor, stream_extractor in MODEL_EXTRACTORS:  # noqa: B007
-            if model.startswith(extractor_name):
+            if extractor_name in model:
                 break
         else:
             # Model was not found in extractor list
@@ -1057,6 +1064,13 @@ def handle_chat_completion_event(transaction, bedrock_attrs):
 
     input_message_list = bedrock_attrs.get("input_message_list", [])
     output_message_list = bedrock_attrs.get("output_message_list", [])
+
+    no_output_content = len(output_message_list) == 1 and not output_message_list[0].get("content", "")
+
+    # This checks handles Sonnet 3+ models which report an additional empty input and empty output in streaming cases after the main content has been generated
+    if not input_message_list and no_output_content:
+        return
+
     number_of_messages = (
         len(input_message_list) + len(output_message_list)
     ) or None  # If 0, attribute will be set to None and removed
@@ -1374,6 +1388,7 @@ def wrap_serialize_to_request(wrapped, instance, args, kwargs):
         extract_agent_attrs=extract_kinesis_agent_attrs,
         library="Kinesis",
     ),
+    ("kinesis", "describe_account_settings"): aws_function_trace("describe_account_settings", library="Kinesis"),
     ("kinesis", "describe_limits"): aws_function_trace("describe_limits", library="Kinesis"),
     ("kinesis", "describe_stream"): aws_function_trace(
         "describe_stream", extract_kinesis, extract_agent_attrs=extract_kinesis_agent_attrs, library="Kinesis"
@@ -1451,6 +1466,7 @@ def wrap_serialize_to_request(wrapped, instance, args, kwargs):
     ("kinesis", "untag_resource"): aws_function_trace(
         "untag_resource", extract_kinesis, extract_agent_attrs=extract_kinesis_agent_attrs, library="Kinesis"
     ),
+    ("kinesis", "update_account_settings"): aws_function_trace("update_account_settings", library="Kinesis"),
     ("kinesis", "update_max_record_size"): aws_function_trace(
         "update_max_record_size", extract_kinesis, extract_agent_attrs=extract_kinesis_agent_attrs, library="Kinesis"
     ),
@@ -1460,6 +1476,12 @@ def wrap_serialize_to_request(wrapped, instance, args, kwargs):
     ("kinesis", "update_stream_mode"): aws_function_trace(
         "update_stream_mode", extract_kinesis, extract_agent_attrs=extract_kinesis_agent_attrs, library="Kinesis"
     ),
+    ("kinesis", "update_stream_warm_throughput"): aws_function_trace(
+        "update_stream_warm_throughput",
+        extract_kinesis,
+        extract_agent_attrs=extract_kinesis_agent_attrs,
+        library="Kinesis",
+    ),
     ("kinesis", "put_record"): aws_message_trace(
         "Produce", "Stream", extract_kinesis, extract_agent_attrs=extract_kinesis_agent_attrs, library="Kinesis"
     ),

tests/agent_unittests/test_agent_protocol.py

@@ -466,7 +466,7 @@ def test_connect(
     # Verify that agent settings sent have converted null, containers, and
     # unserializable types to string
     assert agent_settings_payload["proxy_host"] == "None"
-    assert agent_settings_payload["attributes.include"] == "[]"
+    assert agent_settings_payload["attributes.include"] == str(set())
     assert agent_settings_payload["feature_flag"] == str(set())
     assert isinstance(agent_settings_payload["attribute_filter"], str)
 

tests/external_aiobotocore/test_bedrock_chat_completion_invoke_model.py

@@ -73,6 +73,7 @@ def request_streaming(request):
         "amazon.titan-text-express-v1",
         "ai21.j2-mid-v1",
         "anthropic.claude-instant-v1",
+        "anthropic.claude-3-sonnet-20240229-v1:0",
         "meta.llama2-13b-chat-v1",
         "mistral.mistral-7b-instruct-v0:2",
     ],