Develop merge into main #297

ndesai-newrelic · 2024-10-21T16:15:03Z

No description provided.

Merge pull request #294 from newrelic/develop

codecov · 2024-10-21T16:15:43Z

Codecov Report

Attention: Patch coverage is 70.29361% with 172 lines in your changes missing coverage. Please review.

Project coverage is 57.53%. Comparing base (89838e5) to head (45c3f97).

Files with missing lines	Patch %	Lines
...m/newrelic/agent/android/aei/AEITraceReporter.java	48.14%	49 Missing and 21 partials ⚠️
...elic/agent/android/aei/ApplicationExitMonitor.java	86.24%	12 Missing and 14 partials ⚠️
...m/newrelic/agent/android/aei/AEISessionMapper.java	61.40%	12 Missing and 10 partials ⚠️
...relic/agent/android/payload/FileBackedPayload.java	60.78%	13 Missing and 7 partials ⚠️
.../java/com/newrelic/agent/android/aei/AEITrace.java	80.00%	6 Missing and 2 partials ⚠️
...m/newrelic/agent/android/logging/LogReporting.java	33.33%	6 Missing and 2 partials ⚠️
...com/newrelic/agent/android/aei/AEITraceSender.java	87.23%	5 Missing and 1 partial ⚠️
...ent/android/analytics/AnalyticsControllerImpl.java	50.00%	2 Missing and 2 partials ⚠️
.../newrelic/agent/android/payload/PayloadSender.java	76.47%	2 Missing and 2 partials ⚠️
...relic/agent/android/payload/PayloadController.java	71.42%	0 Missing and 2 partials ⚠️
... and 2 more

Additional details and impacted files

@@             Coverage Diff              @@
##               main     #297      +/-   ##
============================================
+ Coverage     57.40%   57.53%   +0.12%     
- Complexity     3349     3445      +96     
============================================
  Files           325      330       +5     
  Lines         16646    17031     +385     
  Branches       1820     1865      +45     
============================================
+ Hits           9555     9798     +243     
- Misses         6076     6168      +92     
- Partials       1015     1065      +50

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

🚨 Try these New Features:

Flaky Tests Detection - Detect and resolve failed and flaky tests

cthomas-newrelic

Tihs would be the third such merge since release and I'm afraid there is a synchronization issue between the 2 branches. Give it a go, let's see.

BTW, that action no longer works as it once did, so there's no reason to merge that (yet).

chore: refactor AEI code into its own package

* adds new attribute `aeiSessionId` to AEI event when PID of aei is found in session mapper cache. * adds/updates tests

The set of AEI records returned by ART changes over time. Update the on-device storage to remove artifacts no longer raported by ART.

cthomas-newrelic · 2024-10-25T21:01:48Z

Develop has changed behind this commit, so don't commit to main.

This chnage is based on assumptions on an incubating spec. It may be reverted or modified.

To be used in AEI trace reporting. Logging will be refactored to use this within it's LogForwarder. * adds FileBackedPayload pulled up from LogForwarder * adds compression to payload data * adds tests

[NR-331312] Add AEI session mapper

* parses system trace provided by AEI record into thread collection * formats thread data as a String according to ingest spec

Since we've been sing the new vpn, some tests fail due to odd networking exceptions in Mockito. * DRY's up connection mocking code

chore: cleanup tests

* adds/updates tests

* refactor ApplicationExitMonitorTest * adds `fullLifecycle` for the complex sessionMapper interactions

* updates tests

[NR-293384] AEI Trace Reporting

* update AEITraceSender tests * exposed FileBackedPayload `compress()` methods, updates tests

SQUASH ME

[NR-293384] Update request header

[NR-341992] NullPointer Fix

cthomas-newrelic added 2 commits October 17, 2024 15:52

Merge pull request #295 from newrelic/main

f12ccdb

Merge pull request #294 from newrelic/develop

Update workflowCleanup.yml (#296)

d3c7f2f

ndesai-newrelic changed the title ~~Develop~~ Develop merge into main Oct 21, 2024

ndesai-newrelic requested a review from cthomas-newrelic October 21, 2024 16:15

cthomas-newrelic previously approved these changes Oct 21, 2024

View reviewed changes

cthomas-newrelic added 2 commits October 24, 2024 14:17

chore: refactor AEI code into its own package

e56e0d6

Merge pull request #298 from newrelic/feature/refactorAEISource

6f63430

chore: refactor AEI code into its own package

cthomas-newrelic dismissed their stale review via 6f63430 October 24, 2024 22:38

cthomas-newrelic added 3 commits October 24, 2024 15:40

[NR-331312] Add sessionId mapper to manage historic session Ids

87a9cbf

[NR-331312] Integrate session mapper into ApplicationExitMonitor

ed9acd3

* adds new attribute `aeiSessionId` to AEI event when PID of aei is found in session mapper cache. * adds/updates tests

[NR-331312] Reconcile artifacts with AEI record set returned by ART

165b3eb

The set of AEI records returned by ART changes over time. Update the on-device storage to remove artifacts no longer raported by ART.

[NR-331312] Add session ID of historic process as AEI event attribute

e5635dc

This chnage is based on assumptions on an incubating spec. It may be reverted or modified.

ndesai-newrelic requested a review from cthomas-newrelic October 28, 2024 15:59

cthomas-newrelic added 15 commits October 28, 2024 09:13

chore: add file backed payload implementation

c8626ca

To be used in AEI trace reporting. Logging will be refactored to use this within it's LogForwarder. * adds FileBackedPayload pulled up from LogForwarder * adds compression to payload data * adds tests

Merge branch 'develop' into feature/nr331312-aeiSessionMapper

1643b45

fix: increase timeout on Android check task (#303)

dba45d1

Merge branch 'develop' into feature/nr331312-aeiSessionMapper

17ac2c8

Merge pull request #299 from newrelic/feature/nr331312-aeiSessionMapper

c86e0ed

[NR-331312] Add AEI session mapper

[NR-315570] Add AEI trace model

a2247fc

* parses system trace provided by AEI record into thread collection * formats thread data as a String according to ingest spec

chore: cleanup tests

f644a97

Since we've been sing the new vpn, some tests fail due to odd networking exceptions in Mockito. * DRY's up connection mocking code

Merge pull request #305 from newrelic/feature/testCleanup

bb25f63

chore: cleanup tests

[NR-293384] Add AEI trace reporter and upload components

f6b7a25

* adds/updates tests

[NR-293384] Integrate AEIReport/Sender into ApplicationExitMonitor

45a6e7d

* refactor ApplicationExitMonitorTest * adds `fullLifecycle` for the complex sessionMapper interactions

[NR-293384] Integration refinements

4d07986

* updates tests

Merge pull request #306 from newrelic/feature/nr293384-aeiTraceReporting

ae4ccb6

[NR-293384] AEI Trace Reporting

[NR-293384] Update header request

83ca5a2

* update AEITraceSender tests * exposed FileBackedPayload `compress()` methods, updates tests

[NR-293384] Compress artifact on 413 response

d0ac932

SQUASH ME

Merge pull request #307 from newrelic/feature/nr293384-errorsProtocol

946f1ba

[NR-293384] Update request header

ndesai-newrelic and others added 5 commits November 12, 2024 11:59

Null Throwable are generating repetitive logs in Console. (#309)

4876c52

[NR-337308] Add realAgentId to historic AEI metadata (#308)

a7c6252

[NR-341992] null pointer fix

ea7f52a

Merge pull request #313 from newrelic/feature/nr341992-nullPointerFix

45c3f97

[NR-341992] NullPointer Fix

common attributes for logs request (#311)

18edca6

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Develop merge into main #297

Develop merge into main #297

ndesai-newrelic commented Oct 21, 2024

codecov bot commented Oct 21, 2024 •

edited

Loading

cthomas-newrelic left a comment

cthomas-newrelic commented Oct 25, 2024

Develop merge into main #297

Are you sure you want to change the base?

Develop merge into main #297

Conversation

ndesai-newrelic commented Oct 21, 2024

codecov bot commented Oct 21, 2024 • edited Loading

Codecov Report

cthomas-newrelic left a comment

Choose a reason for hiding this comment

cthomas-newrelic commented Oct 25, 2024

codecov bot commented Oct 21, 2024 •

edited

Loading