Merge main into develop-hybrid-core-tracing branch #1605

lrafeei · 2025-12-10T05:01:11Z

A PR to merge the latest changes from main (including pinning Langchain and skikit-learn tests for now)

* Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking

…-agent into develop-strands

* Add baseline instrumentation. * Add tool and agent instrumentation. * Add tests file. * Cleanup instrumentation. * Cleanup. Co-authored-by: Tim Pansino <[email protected]> * [MegaLinter] Apply linters fixes * Strands Mock Model (#1551) * Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking * Add baseline instrumentation. * Add tool and agent instrumentation. * Add tests file. * Cleanup instrumentation. * Cleanup. Co-authored-by: Tim Pansino <[email protected]> * Handle additional args in mock model. * Add test to force exception and exercise _handle_tool_streaming_completion_error. * Strands Mock Model (#1551) * Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking * Add baseline instrumentation. * Add tool and agent instrumentation. * Add tests file. * Cleanup instrumentation. * Cleanup. Co-authored-by: Tim Pansino <[email protected]> * Handle additional args in mock model. * Strands Mock Model (#1551) * Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking * Add baseline instrumentation. * Add tool and agent instrumentation. * Cleanup. Co-authored-by: Tim Pansino <[email protected]> * [MegaLinter] Apply linters fixes * Add test to force exception and exercise _handle_tool_streaming_completion_error. * Implement strands context passing instrumentation. * Address review feedback. * [MegaLinter] Apply linters fixes * Remove test_simple.py file. --------- Co-authored-by: Tim Pansino <[email protected]> Co-authored-by: Timothy Pansino <[email protected]> Co-authored-by: Tim Pansino <[email protected]>

…rands

* Skip hypercorn tests for v0.18 (#1579) * Skip hypercorn tests for v0.18 * Remove tornadomaster for 3.14 * Fix instability in CI caused by health check tests (#1584) * Bump the github_actions group across 1 directory with 5 updates (#1582) Bumps the github_actions group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `5.0.0` | `5.0.1` | | [docker/metadata-action](https://github.com/docker/metadata-action) | `5.8.0` | `5.9.0` | | [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) | `3.6.0` | `3.7.0` | | [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) | `7.1.2` | `7.1.3` | | [github/codeql-action](https://github.com/github/codeql-action) | `4.31.2` | `4.31.3` | Updates `actions/checkout` from 5.0.0 to 5.0.1 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@08c6903...93cb6ef) Updates `docker/metadata-action` from 5.8.0 to 5.9.0 - [Release notes](https://github.com/docker/metadata-action/releases) - [Commits](docker/metadata-action@c1e5197...318604b) Updates `docker/setup-qemu-action` from 3.6.0 to 3.7.0 - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@2910929...c7c5346) Updates `astral-sh/setup-uv` from 7.1.2 to 7.1.3 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](astral-sh/setup-uv@8585678...5a7eac6) Updates `github/codeql-action` from 4.31.2 to 4.31.3 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@0499de3...014f16e) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: 5.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github_actions - dependency-name: docker/metadata-action dependency-version: 5.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_actions - dependency-name: docker/setup-qemu-action dependency-version: 3.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_actions - dependency-name: astral-sh/setup-uv dependency-version: 7.1.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github_actions - dependency-name: github/codeql-action dependency-version: 4.31.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github_actions ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Lalleh Rafeei <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* Rename strands instrument functions * Add instrumentation for strands multiagent * Reorganize strands tests * Strands multiagent tests * Remove timestamp from test expected events. --------- Co-authored-by: Uma Annamalai <[email protected]>

* Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking

* Add baseline instrumentation. * Add tool and agent instrumentation. * Add tests file. * Cleanup instrumentation. * Cleanup. Co-authored-by: Tim Pansino <[email protected]> * [MegaLinter] Apply linters fixes * Strands Mock Model (#1551) * Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking * Add baseline instrumentation. * Add tool and agent instrumentation. * Add tests file. * Cleanup instrumentation. * Cleanup. Co-authored-by: Tim Pansino <[email protected]> * Handle additional args in mock model. * Add test to force exception and exercise _handle_tool_streaming_completion_error. * Strands Mock Model (#1551) * Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking * Add baseline instrumentation. * Add tool and agent instrumentation. * Add tests file. * Cleanup instrumentation. * Cleanup. Co-authored-by: Tim Pansino <[email protected]> * Handle additional args in mock model. * Strands Mock Model (#1551) * Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking * Add baseline instrumentation. * Add tool and agent instrumentation. * Cleanup. Co-authored-by: Tim Pansino <[email protected]> * [MegaLinter] Apply linters fixes * Add test to force exception and exercise _handle_tool_streaming_completion_error. * Implement strands context passing instrumentation. * Address review feedback. * [MegaLinter] Apply linters fixes * Remove test_simple.py file. --------- Co-authored-by: Tim Pansino <[email protected]> Co-authored-by: Timothy Pansino <[email protected]> Co-authored-by: Tim Pansino <[email protected]>

* Rename strands instrument functions * Add instrumentation for strands multiagent * Reorganize strands tests * Strands multiagent tests * Remove timestamp from test expected events. --------- Co-authored-by: Uma Annamalai <[email protected]>

…-agent into develop-strands

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Add Strands Instrumentation.

[Draft] Fixed tool type bug for strands

github-actions · 2025-12-10T05:02:43Z

✅MegaLinter analysis: Success

Descriptor	Linter	Files	Fixed	Elapsed time
✅ ACTION	actionlint	7		0.99s
✅ MARKDOWN	markdownlint	7	0	1.32s
✅ PYTHON	ruff	969	0	0.99s
✅ PYTHON	ruff-format	969	0	0.37s
✅ YAML	prettier	15	0	1.49s
✅ YAML	v8r	15		5.95s
✅ YAML	yamllint	15		0.69s

See detailed reports in MegaLinter artifacts

codecov-commenter · 2025-12-10T05:20:28Z

Codecov Report

❌ Patch coverage is 71.31148% with 105 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.41%. Comparing base (1606479) to head (2430a8e).
⚠️ Report is 32 commits behind head on develop-hybrid-core-tracing.

Files with missing lines	Patch %	Lines
newrelic/hooks/mlmodel_strands.py	68.45%	67 Missing and 33 partials ⚠️
newrelic/hooks/external_botocore.py	64.28%	4 Missing and 1 partial ⚠️

Additional details and impacted files

@@                       Coverage Diff                       @@
##           develop-hybrid-core-tracing    #1605      +/-   ##
===============================================================
- Coverage                        82.60%   82.41%   -0.20%     
===============================================================
  Files                              211      214       +3     
  Lines                            26929    27506     +577     
  Branches                          4597     4683      +86     
===============================================================
+ Hits                             22246    22670     +424     
- Misses                            3327     3442     +115     
- Partials                          1356     1394      +38

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Temporarily pin scikit-learn to <v1.8.0

TimPansino and others added 23 commits October 23, 2025 14:32

Strands Mock Model (#1551)

b18104d

* Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking

Strands Mock Model (#1551)

c19207b

* Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking

Merge branch 'develop-strands' of github.com:newrelic/newrelic-python…

7c3f5ac

…-agent into develop-strands

Merge remote-tracking branch 'origin/main' into develop-strands

6a04fd4

Merge remote-tracking branch 'origin/main' into merge-main-develop-st…

0058126

…rands

Strands MultiAgent Instrumentation (#1590)

748bd5b

* Rename strands instrument functions * Add instrumentation for strands multiagent * Reorganize strands tests * Strands multiagent tests * Remove timestamp from test expected events. --------- Co-authored-by: Uma Annamalai <[email protected]>

Strands Mock Model (#1551)

dcadeb1

* Add strands to tox.ini * Add mock models for strands testing * Add simple test file to validate strands mocking

Strands MultiAgent Instrumentation (#1590)

4d234e4

* Rename strands instrument functions * Add instrumentation for strands multiagent * Reorganize strands tests * Strands multiagent tests * Remove timestamp from test expected events. --------- Co-authored-by: Uma Annamalai <[email protected]>

Merge branch 'develop-strands' of github.com:newrelic/newrelic-python…

85a7509

…-agent into develop-strands

Fixed tool type bug for strands

2ac1494

Merge branch 'main' into sgoel/fixed_tool_type_bug

12b8ba1

Pin langchain & langchain_core (#1604)

7bea863

Merge branch 'main' into sgoel/fixed_tool_type_bug

ea07f00

Merge branch 'main' into develop-strands

7853b9e

Add safeguarding to converse attr extraction. (#1603)

6860fc1

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Merge branch 'main' into sgoel/fixed_tool_type_bug

661efd8

Merge branch 'main' into develop-strands

6cedff1

Merge pull request #1600 from newrelic/develop-strands

c31c334

Add Strands Instrumentation.

Merge branch 'main' into sgoel/fixed_tool_type_bug

ac6eb5f

Merge pull request #1601 from newrelic/sgoel/fixed_tool_type_bug

ac9682c

[Draft] Fixed tool type bug for strands

lrafeei marked this pull request as ready for review December 10, 2025 05:01

lrafeei requested a review from a team as a code owner December 10, 2025 05:01

mergify bot added the tests-failing Tests failing in CI. label Dec 10, 2025

lrafeei and others added 2 commits December 11, 2025 17:19

Pin scikit-learn

d04c1c6

Merge pull request #1606 from newrelic/pin-sklearn

2430a8e

Temporarily pin scikit-learn to <v1.8.0

hmstepanek approved these changes Dec 12, 2025

View reviewed changes

mergify bot added tests-failing Tests failing in CI. and removed tests-failing Tests failing in CI. labels Dec 13, 2025

lrafeei merged commit 378c2c6 into develop-hybrid-core-tracing Dec 15, 2025
269 of 295 checks passed

mergify bot removed the tests-failing Tests failing in CI. label Dec 15, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge main into develop-hybrid-core-tracing branch #1605

Merge main into develop-hybrid-core-tracing branch #1605

Uh oh!

lrafeei commented Dec 10, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Dec 10, 2025 •

edited

Loading

Uh oh!

codecov-commenter commented Dec 10, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Merge main into develop-hybrid-core-tracing branch #1605

Merge main into develop-hybrid-core-tracing branch #1605

Uh oh!

Conversation

lrafeei commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅MegaLinter analysis: Success

Uh oh!

codecov-commenter commented Dec 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

lrafeei commented Dec 10, 2025 •

edited

Loading

github-actions bot commented Dec 10, 2025 •

edited

Loading

codecov-commenter commented Dec 10, 2025 •

edited

Loading