Skip to content

Commit 00f1b14

Browse files
TimPansinomergify[bot]dependabot[bot]lrafeeihmstepanek
authored
Windows Compatibility Changes (#1530)
* Add Windows Test Runners for All Core Test Suites (#1439) * Don't build some extensions on windows * Add windows test runners for all core test suites * Update get-envs script to replace grep * Fix missing lambda handler deprecation * Fix paths in logs in context tests * agent_features: Skip all failing windows tests for now * agent_unittests: Skip all failing windows tests for now * cross_agent: Skip all failing windows tests for now * Convert username lookup to more portable option * Fix handling of health dir paths on Windows * Fix issues related to tempfile on Windows * Fix encoding in test fixtures * Fix globbing on Windows * Format * Fix Python 3.7 compat * Drop windows py37 tests * Update build_ext_errors in setup.py for modern versions * Reduce windows testing scope to 3.13 * Change out windows xfails * Enable colors in CI logs on Windows * Update all python-version specs in CI * Update coverage source paths * Add inline pytest ids to unittests * Add tests for all OS and arch combinations * Remove mac tests for now * Disable agent_streaming on windows arm64 * Lint with actionlint * Add wait to collector_available_fixture to fix race condition * Docker Utilization Disabled on Windows (#1459) * Disable docker utilization on Windows by default * Fix testing issue --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Fix run-program PATH search on Windows (#1463) * Fix run-program PATH search on Windows * Linting --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Build Windows Wheels (#1458) * Add wheel builds for windows * Format with megalinter * Add logic for uploading to pypi vs testpypi --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Windows Certificate Loading (#1460) * Fix loading of certificate bundle on Windows * Remove skip marker --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Fix Compression Testing on Windows (#1470) * Drop failing marker * Fix compression testing on windows * Prefix unused vars * Merge main into develop-windows (#1474) * Bump the github_actions group with 2 updates (#1466) Bumps the github_actions group with 2 updates: [codecov/codecov-action](https://github.com/codecov/codecov-action) and [github/codeql-action](https://github.com/github/codeql-action). Updates `codecov/codecov-action` from 5.4.3 to 5.5.0 - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@18283e0...fdcc847) Updates `github/codeql-action` from 3.29.10 to 3.29.11 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@96f518a...3c3833e) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 5.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_actions - dependency-name: github/codeql-action dependency-version: 3.29.11 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> * Safeguards for deepest unique path (#1450) * Safeguards for deepest unique path * Remove breakpoint --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add try-except to web request parsing (#1449) * Add try-except to web request parsing * Fix parsing logic * Add clarifying comment --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Use legacy bitnami for now (#1471) * Use legacy bitnami for now * Revert solr change * Revert zookeeper change * Add graphene-django instrumentation (#1451) * Add graphene-django instrumentation * Increase naming priority * Remove unused import * Add sychronous schema tests * Clean up test files * Remove commented out code * Megalinter fixes * Add operation & resolver tests * Refine tests * MegaLinter fixes * Suggested reviewer changes * Megalinter fixes * Django middleware filtering settings (#1444) * Reduce number of spans in django framework (#779) * Do not wrap useless middlewares * Fixup: use frozenset * Add config settings * Add middleware enable/disable options * Add testing * Testing exclude/include settings * Add optional fixture scope argument * Rewrite tests to use fixtures * Add new fixture * Fix tests * Fix ruff errors * MegaLinter Fixes * Add config file tests * MegaLinter fixes * Reviewer changes * MegaLinter fixes * Add InstrumentationMiddlewareSettings * More exclude/include filter tests * Megalinter fixes * Tests to increase coverage * Megalinter fixes * More coverage tests * ANOTHER TEST: --------- Co-authored-by: Hannah Stepanek <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Pin bitnami images to bitnamilegacy (#1475) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Distributed CI Image Build (#1478) * Distribute build of CI image across runners * Add weekly CI image rebuild * Add rust to toolchain * Add human readable job names * Linting --------- 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> Co-authored-by: Lalleh Rafeei <[email protected]> Co-authored-by: Hannah Stepanek <[email protected]> * Fix thread utilization on Windows (#1469) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add timer resolution warning on init (#1481) * Merge main into develop-windows (#1527) * Bump the github_actions group with 2 updates (#1466) Bumps the github_actions group with 2 updates: [codecov/codecov-action](https://github.com/codecov/codecov-action) and [github/codeql-action](https://github.com/github/codeql-action). Updates `codecov/codecov-action` from 5.4.3 to 5.5.0 - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@18283e0...fdcc847) Updates `github/codeql-action` from 3.29.10 to 3.29.11 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@96f518a...3c3833e) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-version: 5.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_actions - dependency-name: github/codeql-action dependency-version: 3.29.11 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> * Safeguards for deepest unique path (#1450) * Safeguards for deepest unique path * Remove breakpoint --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add try-except to web request parsing (#1449) * Add try-except to web request parsing * Fix parsing logic * Add clarifying comment --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Use legacy bitnami for now (#1471) * Use legacy bitnami for now * Revert solr change * Revert zookeeper change * Add graphene-django instrumentation (#1451) * Add graphene-django instrumentation * Increase naming priority * Remove unused import * Add sychronous schema tests * Clean up test files * Remove commented out code * Megalinter fixes * Add operation & resolver tests * Refine tests * MegaLinter fixes * Suggested reviewer changes * Megalinter fixes * Django middleware filtering settings (#1444) * Reduce number of spans in django framework (#779) * Do not wrap useless middlewares * Fixup: use frozenset * Add config settings * Add middleware enable/disable options * Add testing * Testing exclude/include settings * Add optional fixture scope argument * Rewrite tests to use fixtures * Add new fixture * Fix tests * Fix ruff errors * MegaLinter Fixes * Add config file tests * MegaLinter fixes * Reviewer changes * MegaLinter fixes * Add InstrumentationMiddlewareSettings * More exclude/include filter tests * Megalinter fixes * Tests to increase coverage * Megalinter fixes * More coverage tests * ANOTHER TEST: --------- Co-authored-by: Hannah Stepanek <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Pin bitnami images to bitnamilegacy (#1475) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Distributed CI Image Build (#1478) * Distribute build of CI image across runners * Add weekly CI image rebuild * Add rust to toolchain * Add human readable job names * Linting * Remove old apis (#1479) * Remove add_custom_parameter(s) * Remove get_browser_timing_footer * Remove ignore_errors arg from error_trace * Remove record_exception * Remove accept_distributed_trace_payload * Remove create_distributed_trace_payload * Remove lambda handler * Remove ObjectWrapper * Remove in_function API * Remove out_function API * Remove pre_function API * Remove post_function API * Remove NewRelicLogHandler * Fix Megalinter errors --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Bump the github_actions group with 3 updates (#1473) Bumps the github_actions group with 3 updates: [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance), [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) and [github/codeql-action](https://github.com/github/codeql-action). Updates `actions/attest-build-provenance` from 2.4.0 to 3.0.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](actions/attest-build-provenance@e8998f9...977bb37) Updates `aquasecurity/trivy-action` from 0.32.0 to 0.33.0 - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@dc5a429...f9424c1) Updates `github/codeql-action` from 3.29.11 to 3.30.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@3c3833e...2d92b76) --- updated-dependencies: - dependency-name: actions/attest-build-provenance dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: github_actions - dependency-name: aquasecurity/trivy-action dependency-version: 0.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_actions - dependency-name: github/codeql-action dependency-version: 3.30.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_actions ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Remove attestations for attestation files by specifying extensions (#1476) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add w3c traceparent header support (#1448) * Add config settings * Add traceparent logic * Log warning if value is not recognized * Move & rename function_not_called * Use existing function called validators * Fixup: lint log message * Fixup: validator import paths * Fixup: validator import path * Fixup: validator import path * Reformat w/ ruff * Use legacy bitnami for now (#1471) * Use legacy bitnami for now * Revert solr change * Revert zookeeper change * Add graphene-django instrumentation (#1451) * Add graphene-django instrumentation * Increase naming priority * Remove unused import * Add sychronous schema tests * Clean up test files * Remove commented out code * Megalinter fixes * Add operation & resolver tests * Refine tests * MegaLinter fixes * Suggested reviewer changes * Megalinter fixes * Fixup: paths * Fixup: reformat lint changes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Lalleh Rafeei <[email protected]> * Add global_settings fallback in ES instrumentation (#1454) * Fallback to global_settings in elasticsearch * Fallback to global_settings in graphql * Fixup: ruff lint --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Remove instrumentation for options method on async ElasticSearch client. (#1477) * Remove instrumentation for options method on async ES client. * Add skip if lower than v8. * Ignore options method in instrumented methods test. * Lint --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Tim Pansino <[email protected]> * Add Converse API non-streaming support. (#1428) * Add Converse API support. * Update aiobotocore instrumentation. * Add support for converse calls made with aioboto3 clients. * Linting fixes. * Review comments. * Remove comment from get call * Trigger tests * Lint --------- Co-authored-by: Hannah Stepanek <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Tim Pansino <[email protected]> * Remove old settings (#1482) * Remove transaction_tracer.capture_attributes * Remove error_collector.capture_attributes * Remove browser_monitoring.capture_attributes * Remove analytic_events.capture_attributes * Remove analytics_events.enabled * Remove error_collector.ignore_errors * Remove strip_exception_messages.whitelist * Remove ssl as a setting * Remove agent_limits.merge_stats_maximum setting * Remove ignore_params setting * ignore_errors removed from test * Fix megalinter errors * Fix falcon tests for master branch (#1484) * Bump the github_actions group with 5 updates (#1483) Bumps the github_actions group with 5 updates: | Package | From | To | | --- | --- | --- | | [actions/setup-python](https://github.com/actions/setup-python) | `5.6.0` | `6.0.0` | | [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) | `1.12.4` | `1.13.0` | | [codecov/codecov-action](https://github.com/codecov/codecov-action) | `5.5.0` | `5.5.1` | | [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) | `0.33.0` | `0.33.1` | | [github/codeql-action](https://github.com/github/codeql-action) | `3.30.0` | `3.30.1` | Updates `actions/setup-python` from 5.6.0 to 6.0.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@a26af69...e797f83) Updates `pypa/gh-action-pypi-publish` from 1.12.4 to 1.13.0 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](pypa/gh-action-pypi-publish@76f52bc...ed0c539) Updates `codecov/codecov-action` from 5.5.0 to 5.5.1 - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](codecov/codecov-action@fdcc847...5a10915) Updates `aquasecurity/trivy-action` from 0.33.0 to 0.33.1 - [Release notes](https://github.com/aquasecurity/trivy-action/releases) - [Commits](aquasecurity/trivy-action@f9424c1...b6643a2) Updates `github/codeql-action` from 3.30.0 to 3.30.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@2d92b76...f1f6e5f) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: github_actions - dependency-name: pypa/gh-action-pypi-publish dependency-version: 1.13.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_actions - dependency-name: codecov/codecov-action dependency-version: 5.5.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github_actions - dependency-name: aquasecurity/trivy-action dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github_actions - dependency-name: github/codeql-action dependency-version: 3.30.1 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> * Updated Packaging (#1480) * Remove unused linters from pyproject.toml * Move packaging config to pyproject.toml * Update setuptools_scm requirement * Add exclude for version file --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Enable coverage for motor instrumentation (#1487) * Drop CI Image Build Caching (#1493) * Add deprecation warning for modules (#1490) * Add deprecation warning for modules * Megalinter fixes * Bump github/codeql-action in the github_actions group (#1492) Bumps the github_actions group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.30.1 to 3.30.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@f1f6e5f...192325c) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.30.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> * Add Additional Delay to Test Startup Fixture (#1494) * Add additional delay to test startup fixture * Fix assertion error message --------- Co-authored-by: Uma Annamalai <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Temporarily remove pypy310 test from pymysql and aiomysql (#1501) * Remove pymysql pypy310 test * Remove aiomysql pypy310 test * Falcon sanic testing fix (#1495) * Remove unsupported Sanic from tests * Remove unsupported Falcon from tests --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Camunda Pyzeebe Instrumentation (#1385) * add initial pyzeebe instrumentation/tests * second attempt at tests (failing) * updated tests - 1/2 passing locally * combine function_trace client tests * fix: py agent team feedback #1 * fix: pyzeebe tests * chore: ruff formatting * fix: review updates #2 * fix: next round of updates * fix: more updates based on feedback * fix: resource parameter capture * chore: ruff lint fixes * fix: no txn tests;add resourceCount attr back --------- Co-authored-by: Uma Annamalai <[email protected]> * Format with ruff (#1505) * Update deprecated urllib APIs (#1499) * Update deprecated urllib APIs * Megalinter fixes * Megalinter fixes * Add skipif and revert urllib tests * Megalinter fixes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add deprecation warning to WSGI environ dict settings (#1496) * WSGI environ dict deprecation warning * Megalinter fixes * Megalinter fixes * Change name of deprecated WSGI settings list * Megalinter fixes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Merge main into develop-11.0.0 (#1503) * Enable coverage for motor instrumentation (#1487) * Drop CI Image Build Caching (#1493) * Add deprecation warning for modules (#1490) * Add deprecation warning for modules * Megalinter fixes * Bump github/codeql-action in the github_actions group (#1492) Bumps the github_actions group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.30.1 to 3.30.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@f1f6e5f...192325c) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.30.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> * Add Additional Delay to Test Startup Fixture (#1494) * Add additional delay to test startup fixture * Fix assertion error message --------- Co-authored-by: Uma Annamalai <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Temporarily remove pypy310 test from pymysql and aiomysql (#1501) * Remove pymysql pypy310 test * Remove aiomysql pypy310 test * Falcon sanic testing fix (#1495) * Remove unsupported Sanic from tests * Remove unsupported Falcon from tests --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Camunda Pyzeebe Instrumentation (#1385) * add initial pyzeebe instrumentation/tests * second attempt at tests (failing) * updated tests - 1/2 passing locally * combine function_trace client tests * fix: py agent team feedback #1 * fix: pyzeebe tests * chore: ruff formatting * fix: review updates #2 * fix: next round of updates * fix: more updates based on feedback * fix: resource parameter capture * chore: ruff lint fixes * fix: no txn tests;add resourceCount attr back --------- Co-authored-by: Uma Annamalai <[email protected]> * Format with ruff (#1505) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Timothy Pansino <[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> Co-authored-by: Uma Annamalai <[email protected]> Co-authored-by: Keagan Peet <[email protected]> * Swap setting deprecations (#1497) * Deprecate analytics_events.max_samples_stored * Deprecate transaction_events.max_samples_stored * Deprecate span_events.max_samples_stored * Deprecate event_harvest_config.harvest_limits.error_event_data * Deprecate custom_insights_events.max_samples_stored * Deprecate application_logging.forwarding.max_samples_stored * Add settings to core/config * Megalinter fixes * Revert env var to previous value * Add variable for default value * Use preferred settings in agent * Megalinter fixes * Reviewer changes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Drop Python 3.7 Support (#1491) * Drop monotonic C extension * Add warning in setup.py * Format and lint setup.py * Fix 3.7 specific logic for Flask tests * Removing all logic related to Python 3.7 * Format with ruff * Remove py37 tests from tox * Remove Python 2 syntax checks * Sort agent.py file * Fix merge commits * Remove unsupported Sanic from tests * Remove unsupported Falcon from tests * Megalinter fixes * Redo changes to setup.py --------- Co-authored-by: Tim Pansino <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Merge pull request #1508 from newrelic/fix-psycopg-as-string Fix psycopg as_string() * Merge pull request #1513 from newrelic/fix-pyzeebe-pypy Remove PyPy From PyZeebe Tests * Fix merge conflict leftovers from removing Python 3.7 (#1515) * Move codecov.yml file to .github folder (#1516) * Update Megalinter (#1510) * Update megalinter workflow * Update megalinter version * Fix RUF059: unused-unpacked-variable * Fix PLW1641: eq-without-hash --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add autogen instrumentation and MCP updates (#1520) * Add instrumentation for autogen MCP tool adapter. (#1409) * Add instrumentation for MCP tool adapter. * [MegaLinter] Apply linters fixes * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Autogen Agent Instrumentation (#1412) * Add autogen agent instrumentation. * Address review feedback. * [MegaLinter] Apply linters fixes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Sync autogen feature branch (#1472) * Add instrumentation for autogen MCP tool adapter. (#1409) * Add instrumentation for MCP tool adapter. * [MegaLinter] Apply linters fixes * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Autogen Agent Instrumentation (#1412) * Add autogen agent instrumentation. * Address review feedback. * [MegaLinter] Apply linters fixes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add instrumentation for autogen MCP tool adapter. (#1409) * Add instrumentation for MCP tool adapter. * [MegaLinter] Apply linters fixes * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Autogen Agent Instrumentation (#1412) * Add autogen agent instrumentation. * Address review feedback. * [MegaLinter] Apply linters fixes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Save linking metadata on generator proxy. * Add comments to changes in instrumentation. * Add LLMAgent events to autogen instrumentation. (#1455) --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * MCP Streamable HTTP Spans (DO NOT MERGE YET) (#1462) * Add tool manager span. * Add tool manager spans to MCP instrumentation to support streaming. --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Update MCP instrumentation to check if AIM is enabled. (#1456) * Update MCP instrumentation to check if AIM is enabled. * Linting --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Tim Pansino <[email protected]> * Add clause to avoid reporting empty content in openai. (#1517) * Add instrumentation for autogen MCP tool adapter. (#1409) * Add instrumentation for MCP tool adapter. * [MegaLinter] Apply linters fixes * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Autogen Agent Instrumentation (#1412) * Add autogen agent instrumentation. * Address review feedback. * [MegaLinter] Apply linters fixes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Sync autogen feature branch (#1472) * Add instrumentation for autogen MCP tool adapter. (#1409) * Add instrumentation for MCP tool adapter. * [MegaLinter] Apply linters fixes * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Autogen Agent Instrumentation (#1412) * Add autogen agent instrumentation. * Address review feedback. * [MegaLinter] Apply linters fixes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add instrumentation for autogen MCP tool adapter. (#1409) * Add instrumentation for MCP tool adapter. * [MegaLinter] Apply linters fixes * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Add autogen agent instrumentation. * Revert "Add autogen agent instrumentation." This reverts commit a26766a. * Autogen Agent Instrumentation (#1412) * Add autogen agent instrumentation. * Address review feedback. * [MegaLinter] Apply linters fixes --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Save linking metadata on generator proxy. * Add comments to changes in instrumentation. * Add LLMAgent events to autogen instrumentation. (#1455) --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * MCP Streamable HTTP Spans (DO NOT MERGE YET) (#1462) * Add tool manager span. * Add tool manager spans to MCP instrumentation to support streaming. --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Update MCP instrumentation to check if AIM is enabled. (#1456) * Update MCP instrumentation to check if AIM is enabled. * Linting --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Tim Pansino <[email protected]> * Add clause to avoid reporting empty content in openai. (#1517) * Update validator path. * Add MCP adapter test for no transaction. * Linting fixups. * Linting --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Tim Pansino <[email protected]> * Switch to Using uv in CI (#1514) * Switch infra to uv * Update Dockerfile for uv * Configure uv with pinned python and shims * Use uv in pre-commit * Move uv download manual setting * Add asv tool for the future * Benchmarking Infrastructure (#1506) * Use asv for benchmarking * Linting --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Fix CI Image (#1523) * Restore all ubuntu packages * Remove pycurl options * Reconfigure uv installation process * Fix for azure_functions_worker venvs --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Bump the github_actions group with 2 updates (#1522) Bumps the github_actions group with 2 updates: [docker/login-action](https://github.com/docker/login-action) and [github/codeql-action](https://github.com/github/codeql-action). Updates `docker/login-action` from 3.5.0 to 3.6.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@184bdaa...5e57cd1) Updates `github/codeql-action` from 3.30.3 to 3.30.5 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@192325c...3599b3b) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github_actions - dependency-name: github/codeql-action dependency-version: 3.30.5 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: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Lalleh Rafeei <[email protected]> Co-authored-by: Hannah Stepanek <[email protected]> Co-authored-by: Uma Annamalai <[email protected]> Co-authored-by: Keagan Peet <[email protected]> * Disable windows wheels (#1528) * Separate integration tests from core tests completely by prefix * Tweak runner counts * Resort jobs in tests.yml workflow (no functional changes) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lalleh Rafeei <[email protected]> Co-authored-by: Hannah Stepanek <[email protected]> Co-authored-by: Uma Annamalai <[email protected]> Co-authored-by: Keagan Peet <[email protected]>
1 parent 7f3461d commit 00f1b14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1178
-632
lines changed

.github/actionlint.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright 2010 New Relic, Inc.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
paths:
16+
.github/workflows/**/*.{yml,yaml}:
17+
ignore:
18+
# This runner exists, but is in beta and not known to actionlint.
19+
- 'label "windows-11-arm" is unknown\. .+'

.github/scripts/get-envs.py

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#!/usr/bin/env python
2+
# Copyright 2010 New Relic, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
import fileinput
17+
import os
18+
from textwrap import dedent
19+
20+
GROUP_NUMBER = int(os.environ["GROUP_NUMBER"]) - 1
21+
TOTAL_GROUPS = int(os.environ["TOTAL_GROUPS"])
22+
GITHUB_JOB = os.environ["GITHUB_JOB"]
23+
24+
25+
def main(stdin):
26+
environments = [env.rstrip() for env in stdin]
27+
filtered_envs = [env for env in environments if env.startswith(GITHUB_JOB + "-")]
28+
grouped_envs = filtered_envs[GROUP_NUMBER::TOTAL_GROUPS]
29+
joined_envs = ",".join(grouped_envs)
30+
31+
# If not environments are found, raise an error with helpful information.
32+
if joined_envs:
33+
print(joined_envs)
34+
else:
35+
error_msg = dedent(f"""
36+
No matching environments found.
37+
GITHUB_JOB = {GITHUB_JOB}
38+
GROUP_NUMBER = {GROUP_NUMBER + 1}
39+
TOTAL_GROUPS = {TOTAL_GROUPS}
40+
41+
environments = {environments}
42+
filtered_envs = {filtered_envs}
43+
grouped_envs = {grouped_envs}
44+
joined_envs = {joined_envs}
45+
""")
46+
raise RuntimeError(error_msg(environments))
47+
48+
49+
if __name__ == "__main__":
50+
with fileinput.input() as stdin:
51+
main(stdin)

.github/workflows/deploy.yml

Lines changed: 74 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,44 @@ permissions:
2323
contents: read
2424

2525
jobs:
26-
build-linux-py3:
27-
runs-on: ubuntu-24.04
26+
build-wheels:
2827
strategy:
2928
fail-fast: false
3029
matrix:
31-
wheel:
32-
- cp38-manylinux
33-
- cp38-musllinux
34-
- cp39-manylinux
35-
- cp39-musllinux
36-
- cp310-manylinux
37-
- cp310-musllinux
38-
- cp311-manylinux
39-
- cp311-musllinux
40-
- cp312-manylinux
41-
- cp312-musllinux
42-
- cp313-manylinux
43-
- cp313-musllinux
30+
include:
31+
# Linux glibc
32+
- wheel: cp38-manylinux
33+
os: ubuntu-24.04
34+
- wheel: cp39-manylinux
35+
os: ubuntu-24.04
36+
- wheel: cp310-manylinux
37+
os: ubuntu-24.04
38+
- wheel: cp311-manylinux
39+
os: ubuntu-24.04
40+
- wheel: cp312-manylinux
41+
os: ubuntu-24.04
42+
- wheel: cp313-manylinux
43+
os: ubuntu-24.04
44+
# Linux musllibc
45+
- wheel: cp38-musllinux
46+
os: ubuntu-24.04
47+
- wheel: cp39-musllinux
48+
os: ubuntu-24.04
49+
- wheel: cp310-musllinux
50+
os: ubuntu-24.04
51+
- wheel: cp311-musllinux
52+
os: ubuntu-24.04
53+
- wheel: cp312-musllinux
54+
os: ubuntu-24.04
55+
- wheel: cp313-musllinux
56+
os: ubuntu-24.04
57+
# Windows
58+
# Windows wheels won't but published until the full release announcement.
59+
# - wheel: cp313-win
60+
# os: windows-2025
61+
62+
name: Build wheels for ${{ matrix.wheel }}
63+
runs-on: ${{ matrix.os }}
4464

4565
steps:
4666
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
@@ -49,17 +69,26 @@ jobs:
4969
fetch-depth: 0
5070

5171
- name: Setup QEMU
72+
if: runner.os == 'Linux'
5273
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # 3.6.0
74+
with:
75+
platforms: arm64
5376

5477
- name: Build Wheels
5578
uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # 2.23.3
5679
env:
57-
CIBW_PLATFORM: linux
80+
CIBW_PLATFORM: auto
5881
CIBW_BUILD: "${{ matrix.wheel }}*"
5982
CIBW_ARCHS_LINUX: x86_64 aarch64
60-
CIBW_ENVIRONMENT: "LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/usr/local/lib64:/usr/local/lib"
83+
CIBW_ARCHS_MACOS: native
84+
CIBW_ARCHS_WINDOWS: AMD64 ARM64
85+
CIBW_ENVIRONMENT_LINUX: "LD_LIBRARY_PATH=/opt/rh/devtoolset-8/root/usr/lib64:/opt/rh/devtoolset-8/root/usr/lib:/opt/rh/devtoolset-8/root/usr/lib64/dyninst:/opt/rh/devtoolset-8/root/usr/lib/dyninst:/usr/local/lib64:/usr/local/lib"
6186
CIBW_TEST_REQUIRES: pytest
62-
CIBW_TEST_COMMAND: "PYTHONPATH={project}/tests pytest {project}/tests/agent_unittests -vx"
87+
CIBW_TEST_COMMAND_LINUX: "export PYTHONPATH={project}/tests; pytest {project}/tests/agent_unittests -vx"
88+
CIBW_TEST_COMMAND_MACOS: "export PYTHONPATH={project}/tests; pytest {project}/tests/agent_unittests -vx"
89+
CIBW_TEST_COMMAND_WINDOWS: "set PYTHONPATH={project}/tests; pytest {project}/tests/agent_unittests -vx"
90+
# Windows ARM64 tests won't run when using cross compilation. Skip unless we can move to a native windows-arm runner.
91+
CIBW_TEST_SKIP: "*-win_arm64"
6392

6493
- name: Upload Artifacts
6594
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
@@ -70,7 +99,9 @@ jobs:
7099
retention-days: 1
71100

72101
build-sdist:
102+
name: Build sdist
73103
runs-on: ubuntu-24.04
104+
74105
steps:
75106
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
76107
with:
@@ -79,7 +110,7 @@ jobs:
79110

80111
- uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # 6.0.0
81112
with:
82-
python-version: "3.12"
113+
python-version: "3.13"
83114

84115
- name: Install Dependencies
85116
run: |
@@ -107,24 +138,35 @@ jobs:
107138
retention-days: 1
108139

109140
publish:
141+
name: Publish
110142
runs-on: ubuntu-24.04
111-
environment: pypi
112143
permissions:
113144
contents: read
114145
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
115146
attestations: write
116-
117147
needs:
118-
- build-linux-py3
148+
- build-wheels
119149
- build-sdist
120150

151+
strategy:
152+
matrix:
153+
pypi-instance:
154+
- pypi
155+
# Valid values for deployment are:
156+
# - "pypi" for production
157+
# - "testpypi" for testing
158+
# - "build-only" to skip publishing and only test builds.
159+
160+
environment: ${{ matrix.pypi-instance }}
161+
121162
steps:
122163
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # 5.0.0
123164
with:
124165
path: ./dist/
125166
merge-multiple: true
126167

127168
- name: Upload Package to S3
169+
if: matrix.pypi-instance == 'pypi'
128170
run: |
129171
tarball="$(basename ./dist/*.tar.gz)"
130172
md5_file="${tarball}.md5"
@@ -137,9 +179,16 @@ jobs:
137179
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
138180
AWS_DEFAULT_REGION: us-west-2
139181

140-
- name: Upload Package
182+
- name: Upload Package to PyPI
183+
if: matrix.pypi-instance == 'pypi'
141184
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # 1.13.0
142185

186+
- name: Upload Package to TestPyPI
187+
if: matrix.pypi-instance == 'testpypi'
188+
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # 1.13.0
189+
with:
190+
repository-url: https://test.pypi.org/legacy/
191+
143192
- name: Attest
144193
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # 3.0.0
145194
id: attest
@@ -149,11 +198,13 @@ jobs:
149198
./dist/*.tar.gz
150199

151200
- name: Wait for release to be available
201+
if: matrix.pypi-instance == 'pypi'
152202
id: wait
153203
run: |
154204
sleep 60
155205

156206
- name: Create release tags for Lambda and K8s Init Containers
207+
if: matrix.pypi-instance == 'pypi'
157208
run: |
158209
RELEASE_TITLE="New Relic Python Agent ${GITHUB_REF_NAME}.0"
159210
RELEASE_TAG="${GITHUB_REF_NAME}.0_python"

.github/workflows/get-envs.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)