Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prep 3.0.2 Release #781

Merged
merged 4 commits into from
Nov 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@

## Pending

## [3.0.2] 2023-11-06
### Fixed
- Core Agent fails to download on newer Mac OS/Apple Silicon (Issue #779)

## [3.0.0rc1] 2023-09-08
## [3.0.1] 2023-10-06
### Added
- Build wheels for Python 3.12

## [3.0.0] 2023-09-14

Version 3.0.0 drops support for Python 2.7 and < 3.8, as well as Django < 3.2.
If you need to continue using Python < 3.8 or Django < 3.2, please continue using v2.26.1.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

setup(
name="scout_apm",
version="3.0.1",
version="3.0.2",
description="Scout Application Performance Monitoring Agent",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down
21 changes: 0 additions & 21 deletions tests/integration/instruments/test_urllib3.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@

import httpretty
import pytest
import urllib3

from scout_apm.compat import urllib3_cert_pool_manager
from scout_apm.instruments.urllib3 import ensure_installed
from tests.compat import mock
from tests.tools import delete_attributes

mock_not_attempted = mock.patch(
"scout_apm.instruments.urllib3.have_patched_pool_urlopen", new=False
Expand Down Expand Up @@ -103,25 +101,6 @@ def test_request_type_error(tracked_request):
assert span.tags["url"] == "https://example.com:443/"


def test_request_no_absolute_url(caplog, tracked_request):
ensure_installed()
delete_absolute_url = delete_attributes(urllib3.HTTPConnectionPool, "_absolute_url")
with httpretty.enabled(allow_net_connect=False), delete_absolute_url:
httpretty.register_uri(
httpretty.GET, "https://example.com/", body="Hello World!"
)

http = urllib3_cert_pool_manager()
response = http.request("GET", "https://example.com")

assert response.status == 200
assert response.data == b"Hello World!"
assert len(tracked_request.complete_spans) == 1
span = tracked_request.complete_spans[0]
assert span.operation == "HTTP/GET"
assert span.tags["url"] == "Unknown"


def test_request_ignore_errors_host(tracked_request):
ensure_installed()
with httpretty.enabled(allow_net_connect=False):
Expand Down