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.

Sign up for GitHub

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

Jump to bottom

Merge to Staging for v2.2.0 release #74

Merged
merged 5 commits into from
Jul 15, 2023
Merged

Merge to Staging for v2.2.0 release #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30a8984
Merge pull request #56 from adobe/staging
addb Apr 12, 2023
8d56bde
Set parent ID to Edge response events (#69)
kevinlind Jun 28, 2023
c425bd0
Merge pull request #71 from adobe/dev-v2.1.0
kevinlind Jul 10, 2023
64cbb31
Get 'eventIndex' from 'report' object for interact response errors an…
kevinlind Jul 14, 2023
fc63803
Update version to 2.2.0 (#73)
kevinlind Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,15 @@ ci-publish-staging: clean build-release

ci-publish-main: clean build-release
(./code/gradlew -p code/${EXTENSION-LIBRARY-FOLDER-NAME} publishReleasePublicationToSonatypeRepository -Prelease)

# usage: update-version VERSION=9.9.9 CORE-VERSION=8.8.8
# usage: update-version VERSION=9.9.9
update-version:
@echo "Updating version to $(VERSION), Core version to $(CORE-VERSION)"
sed -i '' "s/[0-9]*\.[0-9]*\.[0-9]/$(VERSION)/g" ./code/edge/src/main/java/com/adobe/marketing/mobile/EdgeConstants.java
sed -i '' "s/\(moduleVersion=\)[0-9]*\.[0-9]*\.[0-9]/\1$(VERSION)/g" ./code/gradle.properties
@if [ -z "$(CORE-VERSION)" ]; then \
echo "CORE-VERSION was not provided, skipping"; \
else \
sed -i '' "s/\(mavenCoreVersion=\)[0-9]*\.[0-9]*\.[0-9]/\1$(CORE-VERSION)/g" ./code/gradle.properties; \
fi
48 changes: 39 additions & 9 deletions code/edge/src/androidTest/java/com/adobe/marketing/mobile/EdgeFunctionalTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ public void testSendEvent_receivesResponseEventHandle_sendsResponseEvent_pairedW
assertEquals("buttonColor", flattenedEventData.get("payload[0].scope"));
assertEquals(requestId, flattenedEventData.get("requestId"));
assertEquals(requestEventUuid, flattenedEventData.get("requestEventId"));
assertEquals(requestEventUuid, responseEvents.get(0).getParentID());
}

@Test
Expand All @@ -923,7 +924,7 @@ public void testSendEvent_receivesResponseEventWarning_sendsErrorResponseEvent_p
setExpectationEvent(EventType.EDGE, EventSource.ERROR_RESPONSE_CONTENT, 1);

final String responseBody =
"\u0000{\"requestId\": \"0ee43289-4a4e-469a-bf5c-1d8186919a26\",\"handle\": [],\"warnings\": [{\"eventIndex\": 0,\"code\": \"personalization:0\",\"message\": \"Failed due to unrecoverable system error\"}]}\n";
"\u0000{\"requestId\": \"0ee43289-4a4e-469a-bf5c-1d8186919a26\",\"handle\": [],\"warnings\": [{\"code\": \"personalization:0\",\"message\": \"Failed due to unrecoverable system error\",\"report\":{\"eventIndex\":0}}]}\n";
HttpConnecting responseConnection = createNetworkResponse(responseBody, 200);
setExpectationNetworkRequest(EXEDGE_INTERACT_URL_STRING, POST, 1);
setNetworkResponseFor(EXEDGE_INTERACT_URL_STRING, POST, responseConnection);
Expand Down Expand Up @@ -961,12 +962,12 @@ public void testSendEvent_receivesResponseEventWarning_sendsErrorResponseEvent_p
assertNotNull(responseEventData);

Map<String, String> flattenedEventData = FunctionalTestUtils.flattenMap(responseEventData);
assertEquals(5, flattenedEventData.size());
assertEquals(4, flattenedEventData.size());
assertEquals("personalization:0", flattenedEventData.get("code"));
assertEquals("Failed due to unrecoverable system error", flattenedEventData.get("message"));
assertEquals("0", flattenedEventData.get("eventIndex"));
assertEquals(requestId, flattenedEventData.get("requestId"));
assertEquals(requestEventUuid, flattenedEventData.get("requestEventId"));
assertEquals(requestEventUuid, errorResponseEvents.get(0).getParentID());
}

// --------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1237,6 +1238,25 @@ public void testSetLocationHint_andGetLocationHint_hintWithUnicodeCharacters_doe
assertEquals(expectedHint, result[0]);
}

@Test
public void testGetLocationHint_responseEventChainedToParentId() throws InterruptedException {
final CountDownLatch latch = new CountDownLatch(1);

Edge.setLocationHint("or2");
Edge.getLocationHint(s -> {
latch.countDown();
});

latch.await(2000, TimeUnit.MILLISECONDS);

List<Event> dispatchedRequests = getDispatchedEventsWith(EventType.EDGE, EventSource.REQUEST_IDENTITY);
assertEquals(1, dispatchedRequests.size());
List<Event> dispatchedResponses = getDispatchedEventsWith(EventType.EDGE, EventSource.RESPONSE_IDENTITY);
assertEquals(1, dispatchedResponses.size());

assertEquals(dispatchedRequests.get(0).getUniqueIdentifier(), dispatchedResponses.get(0).getParentID());
}

// --------------------------------------------------------------------------------------------
// test persisted hits (recoverable errors)
// --------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1375,7 +1395,7 @@ public void testSendEvent_withXDMData_sendsExEdgeNetworkRequest_afterRetryMultip
public void testSendEvent_multiStatusResponse_dispatchesEvents() throws InterruptedException {
setExpectationNetworkRequest(EXEDGE_INTERACT_URL_STRING, POST, 1);
final String response =
"\u0000{\"requestId\":\"72eaa048-207e-4dde-bf16-0cb2b21336d5\",\"handle\":[],\"errors\":[{\"type\":\"https://ns.adobe.com/aep/errors/EXEG-0201-504\",\"status\":504,\"title\":\"The 'com.adobe.experience.platform.ode' service is temporarily unable to serve this request. Please try again later.\",\"eventIndex\":0}],\"warnings\":[{\"type\":\"https://ns.adobe.com/aep/errors/EXEG-0204-200\",\"status\":200,\"title\":\"A warning occurred while calling the 'com.adobe.audiencemanager' service for this request.\",\"eventIndex\":0,\"report\":{\"cause\":{\"message\":\"Cannot read related customer for device id: ...\",\"code\":202}}}]}\n";
"\u0000{\"requestId\":\"72eaa048-207e-4dde-bf16-0cb2b21336d5\",\"handle\":[],\"errors\":[{\"type\":\"https://ns.adobe.com/aep/errors/EXEG-0201-504\",\"status\":504,\"title\":\"The 'com.adobe.experience.platform.ode' service is temporarily unable to serve this request. Please try again later.\",\"report\":{\"eventIndex\":0}}],\"warnings\":[{\"type\":\"https://ns.adobe.com/aep/errors/EXEG-0204-200\",\"status\":200,\"title\":\"A warning occurred while calling the 'com.adobe.audiencemanager' service for this request.\",\"report\":{\"eventIndex\":0,\"cause\":{\"message\":\"Cannot read related customer for device id: ...\",\"code\":202}}}]}\n";
HttpConnecting responseConnection = createNetworkResponse(response, 207);

setNetworkResponseFor(EXEDGE_INTERACT_URL_STRING, POST, responseConnection);
Expand All @@ -1389,30 +1409,35 @@ public void testSendEvent_multiStatusResponse_dispatchesEvents() throws Interrup
assertNetworkRequestCount();
assertExpectedEvents(false);

List<Event> requestEvents = getDispatchedEventsWith(EventType.EDGE, EventSource.REQUEST_CONTENT);
assertEquals(1, requestEvents.size());

List<Event> resultEvents = getDispatchedEventsWith(EventType.EDGE, EventSource.ERROR_RESPONSE_CONTENT);
assertEquals(2, resultEvents.size());

Map<String, String> eventData1 = FunctionalTestUtils.flattenMap(resultEvents.get(0).getEventData());
assertEquals(6, eventData1.size());
assertEquals(5, eventData1.size());
assertEquals("504", eventData1.get("status"));
assertEquals("0", eventData1.get("eventIndex"));
assertEquals("https://ns.adobe.com/aep/errors/EXEG-0201-504", eventData1.get("type"));
assertEquals(
"The 'com.adobe.experience.platform.ode' service is temporarily unable to serve this request. Please try again later.",
eventData1.get("title")
);
assertEquals(requestEvents.get(0).getUniqueIdentifier(), eventData1.get("requestEventId"));
assertEquals(requestEvents.get(0).getUniqueIdentifier(), resultEvents.get(0).getParentID());

Map<String, String> eventData2 = FunctionalTestUtils.flattenMap(resultEvents.get(1).getEventData());
assertEquals(8, eventData2.size());
assertEquals(7, eventData2.size());
assertEquals("200", eventData2.get("status"));
assertEquals("0", eventData2.get("eventIndex"));
assertEquals("https://ns.adobe.com/aep/errors/EXEG-0204-200", eventData2.get("type"));
assertEquals(
"A warning occurred while calling the 'com.adobe.audiencemanager' service for this request.",
eventData2.get("title")
);
assertEquals("Cannot read related customer for device id: ...", eventData2.get("report.cause.message"));
assertEquals("202", eventData2.get("report.cause.code"));
assertEquals(requestEvents.get(0).getUniqueIdentifier(), eventData2.get("requestEventId"));
assertEquals(requestEvents.get(0).getUniqueIdentifier(), resultEvents.get(1).getParentID());
}

@Test
Expand Down Expand Up @@ -1447,12 +1472,15 @@ public void testSendEvent_fatalError() throws InterruptedException {
assertNetworkRequestCount();
assertExpectedEvents(false);

List<Event> requestEvents = getDispatchedEventsWith(EventType.EDGE, EventSource.REQUEST_CONTENT);
assertEquals(1, requestEvents.size());

List<Event> resultEvents = getDispatchedEventsWith(EventType.EDGE, EventSource.ERROR_RESPONSE_CONTENT);
assertEquals(1, resultEvents.size());

Map<String, String> eventData = FunctionalTestUtils.flattenMap(resultEvents.get(0).getEventData());

assertEquals(10, eventData.size());
assertEquals(11, eventData.size());
assertEquals("422", eventData.get("status"));
assertEquals("https://ns.adobe.com/aep/errors/EXEG-0104-422", eventData.get("type"));
assertEquals("Unprocessable Entity", eventData.get("title"));
Expand All @@ -1468,6 +1496,8 @@ public void testSendEvent_fatalError() throws InterruptedException {
);
assertEquals("0f8821e5-ed1a-4301-b445-5f336fb50ee8", eventData.get("report.requestId"));
assertEquals("test@AdobeOrg", eventData.get("report.orgId"));
assertEquals(requestEvents.get(0).getUniqueIdentifier(), eventData.get("requestEventId"));
assertEquals(requestEvents.get(0).getUniqueIdentifier(), resultEvents.get(0).getParentID());
}

private void updateConfiguration(final Map<String, Object> config) throws InterruptedException {
Expand Down