Skip to content

Commit 5618f78

Browse files
committed
Merge branch 'remove-loguru-version-check' of github.com:newrelic/newrelic-python-agent into remove-loguru-version-check
2 parents 5ddf5f2 + 63ca33b commit 5618f78

File tree

4 files changed

+28
-16
lines changed

4 files changed

+28
-16
lines changed

tests/logger_loguru/test_local_decorating.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414

1515
import platform
1616

17-
from newrelic.api.application import application_settings
18-
from newrelic.api.background_task import background_task
19-
from newrelic.api.time_trace import current_trace
20-
from newrelic.api.transaction import current_transaction
2117
from testing_support.fixtures import reset_core_stats_engine
2218
from testing_support.validators.validate_log_event_count import validate_log_event_count
2319
from testing_support.validators.validate_log_event_count_outside_transaction import (
2420
validate_log_event_count_outside_transaction,
2521
)
2622

23+
from newrelic.api.application import application_settings
24+
from newrelic.api.background_task import background_task
25+
from newrelic.api.time_trace import current_trace
26+
from newrelic.api.transaction import current_transaction
27+
2728

2829
def set_trace_ids():
2930
txn = current_transaction()

tests/logger_loguru/test_log_forwarding.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,21 @@
1313
# limitations under the License.
1414

1515
import logging
16-
import pytest
1716

18-
from newrelic.api.background_task import background_task
19-
from newrelic.api.time_trace import current_trace
20-
from newrelic.api.transaction import current_transaction
17+
import pytest
2118
from testing_support.fixtures import reset_core_stats_engine
2219
from testing_support.validators.validate_log_event_count import validate_log_event_count
2320
from testing_support.validators.validate_log_event_count_outside_transaction import (
2421
validate_log_event_count_outside_transaction,
2522
)
2623
from testing_support.validators.validate_log_events import validate_log_events
27-
from testing_support.validators.validate_log_events_outside_transaction import validate_log_events_outside_transaction
24+
from testing_support.validators.validate_log_events_outside_transaction import (
25+
validate_log_events_outside_transaction,
26+
)
27+
28+
from newrelic.api.background_task import background_task
29+
from newrelic.api.time_trace import current_trace
30+
from newrelic.api.transaction import current_transaction
2831

2932

3033
def set_trace_ids():

tests/logger_loguru/test_metrics.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from newrelic.api.background_task import background_task
1615
from testing_support.fixtures import reset_core_stats_engine
1716
from testing_support.validators.validate_custom_metrics_outside_transaction import (
1817
validate_custom_metrics_outside_transaction,
1918
)
20-
from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
19+
from testing_support.validators.validate_transaction_metrics import (
20+
validate_transaction_metrics,
21+
)
22+
23+
from newrelic.api.background_task import background_task
2124

2225

2326
def exercise_logging(logger):

tests/logger_loguru/test_settings.py

+10-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import pytest
1615
import platform
1716

17+
import pytest
18+
from testing_support.fixtures import (
19+
override_application_settings,
20+
reset_core_stats_engine,
21+
)
22+
from testing_support.validators.validate_log_event_count import validate_log_event_count
23+
from testing_support.validators.validate_transaction_metrics import (
24+
validate_transaction_metrics,
25+
)
26+
1827
from newrelic.api.application import application_settings
1928
from newrelic.api.background_task import background_task
20-
from testing_support.fixtures import reset_core_stats_engine
21-
from testing_support.validators.validate_log_event_count import validate_log_event_count
22-
from testing_support.fixtures import override_application_settings
23-
from testing_support.validators.validate_transaction_metrics import validate_transaction_metrics
2429

2530

2631
def get_metadata_string(log_message, is_txn):

0 commit comments

Comments
 (0)