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

add response body for partial 207 errors for aggregated payload #751

Merged
merged 2 commits into from
Nov 10, 2016
Merged

add response body for partial 207 errors for aggregated payload #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dfe983
add response body for partial 207 errors for aggregated payload,
Nov 8, 2016
e00a7e2
add timestamp to error response
Nov 9, 2016
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
4 changes: 2 additions & 2 deletions ...ood-core/src/main/java/com/rackspacecloud/blueflood/inputs/formats/AggregatedPayload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ private static void validate(AggregatedPayload payload) {
}

payload.validationErrors.add(new ErrorResponse.ErrorData(payload.getTenantId(), metricName,
source, constraintViolation.getMessage()));
source, constraintViolation.getMessage(), payload.getTimestamp()));
}
}

Expand Down Expand Up @@ -158,7 +158,7 @@ public List<ErrorResponse.ErrorData> getValidationErrors() {
/**
* This method is invoked by the validator automatically
*/
@AssertTrue(message="Atleast one of the aggregated metrics(gauges, counters, timers, sets) are expected")
@AssertTrue(message="At least one of the aggregated metrics(gauges, counters, timers, sets) are expected")
private boolean isValid() {
boolean isGaugePresent = gauges != null && gauges.length > 0;
boolean isCounterPresent = counters != null && counters.length > 0;
Expand Down
21 changes: 20 additions & 1 deletion blueflood-core/src/main/java/com/rackspacecloud/blueflood/outputs/formats/ErrorResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,38 @@ public String toString() {
public static class ErrorData {

private String tenantId;
private Long timestamp;
private String metricName;
private String source;
private String message;

public ErrorData() {
}

public ErrorData(String tenantId, String metricName, String source, String message) {
/***
* Data class for storing error message for a metric from an ingest validation error
* @param tenantId the tenantId of for the metric
* @param metricName the name of the metric
* @param source the source of the error within the metric, i.e. the field with the violiation
* @param message the error message
* @param timestamp the collectionTime of a metric, timestamp of an aggregated metric, or when value of an event
*/
public ErrorData(String tenantId, String metricName, String source, String message, Long timestamp) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe more comment on what this timestamp represent? Is this ingest time? Collection time?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, that. Where should I put the comment?

this.tenantId = tenantId == null ? "" : tenantId;
this.metricName = metricName == null ? "" : metricName;
this.source = source;
this.message = message;
this.timestamp = timestamp;
}

public String getTenantId() {
return tenantId;
}

public Long getTimestamp() {
return timestamp;
}

public String getMetricName() {
return metricName;
}
Expand All @@ -65,6 +79,10 @@ public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}

public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}

public void setMetricName(String metricName) {
this.metricName = metricName;
}
Expand All @@ -81,6 +99,7 @@ public void setMessage(String message) {
public String toString() {
return "ErrorData{" +
"tenantId='" + tenantId + '\'' +
", timestamp='" + timestamp + '\'' +
", metricName='" + metricName + '\'' +
", source='" + source + '\'' +
", message='" + message + '\'' +
Expand Down
71 changes: 39 additions & 32 deletions ...on-test/java/com/rackspacecloud/blueflood/inputs/handlers/HttpHandlerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@
import java.io.*;
import java.net.URISyntaxException;
import java.util.*;
import java.util.regex.Pattern;
import java.util.zip.GZIPOutputStream;

import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static org.mockito.Mockito.*;
import static org.junit.Assert.*;
import static com.rackspacecloud.blueflood.TestUtils.*;

public class HttpHandlerIntegrationTest extends HttpIntegrationTestBase {

static private final String TENANT_ID = "acTEST";
static private long BEFORE_CURRENT_COLLECTIONTIME_MS = Configuration.getInstance().getLongProperty( CoreConfig.BEFORE_CURRENT_COLLECTIONTIME_MS );
static private long AFTER_CURRENT_COLLECTIONTIME_MS = Configuration.getInstance().getLongProperty( CoreConfig.AFTER_CURRENT_COLLECTIONTIME_MS );

//A time stamp 2 days ago
private final long baseMillis = Calendar.getInstance().getTimeInMillis() - 172800000;
Expand Down Expand Up @@ -85,7 +85,7 @@ public void testHttpIngestionInvalidPastCollectionTime() throws Exception {

String postfix = getPostfix();

long time = System.currentTimeMillis() - TIME_DIFF_MS - Configuration.getInstance().getLongProperty( CoreConfig.BEFORE_CURRENT_COLLECTIONTIME_MS );
long time = System.currentTimeMillis() - TIME_DIFF_MS - BEFORE_CURRENT_COLLECTIONTIME_MS;

HttpResponse response = postGenMetric(TENANT_ID, postfix, postPath, time );

Expand All @@ -95,8 +95,8 @@ public void testHttpIngestionInvalidPastCollectionTime() throws Exception {
assertEquals("Number of errors invalid", 3, errorResponse.getErrors().size());
for (int i = 0; i < 3; i++) {
assertEquals("Invalid error source", "collectionTime", errorResponse.getErrors().get(i).getSource());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than 259200000 milliseconds into the past." +
" Cannot be more than 600000 milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than " + BEFORE_CURRENT_COLLECTIONTIME_MS + " milliseconds into the past." +
" Cannot be more than " + AFTER_CURRENT_COLLECTIONTIME_MS + " milliseconds into the future", errorResponse.getErrors().get(i).getMessage());
}

}
Expand All @@ -106,7 +106,7 @@ public void testHttpIngestionInvalidFutureCollectionTime() throws Exception {

String postfix = getPostfix();

long time = System.currentTimeMillis() + TIME_DIFF_MS + Configuration.getInstance().getLongProperty( CoreConfig.AFTER_CURRENT_COLLECTIONTIME_MS );
long time = System.currentTimeMillis() + TIME_DIFF_MS + AFTER_CURRENT_COLLECTIONTIME_MS;

HttpResponse response = postGenMetric(TENANT_ID, postfix, postPath, time );

Expand All @@ -116,17 +116,17 @@ public void testHttpIngestionInvalidFutureCollectionTime() throws Exception {
assertEquals("Number of errors invalid", 3, errorResponse.getErrors().size());
for (int i = 0; i < 3; i++) {
assertEquals("Invalid error source", "collectionTime", errorResponse.getErrors().get(i).getSource());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than 259200000 milliseconds into the past." +
" Cannot be more than 600000 milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than " + BEFORE_CURRENT_COLLECTIONTIME_MS + " milliseconds into the past." +
" Cannot be more than " + AFTER_CURRENT_COLLECTIONTIME_MS + " milliseconds into the future", errorResponse.getErrors().get(i).getMessage());
}
}

@Test
public void testHttpIngestionPartialInvalidCollectionTime() throws Exception {
String postfix = getPostfix();
long validTime = System.currentTimeMillis();
long pastTime = System.currentTimeMillis() - TIME_DIFF_MS - Configuration.getInstance().getLongProperty( CoreConfig.BEFORE_CURRENT_COLLECTIONTIME_MS );
long futureTime = System.currentTimeMillis() + TIME_DIFF_MS + Configuration.getInstance().getLongProperty( CoreConfig.AFTER_CURRENT_COLLECTIONTIME_MS );
long pastTime = System.currentTimeMillis() - TIME_DIFF_MS - BEFORE_CURRENT_COLLECTIONTIME_MS;
long futureTime = System.currentTimeMillis() + TIME_DIFF_MS + AFTER_CURRENT_COLLECTIONTIME_MS;

String jsonBody = getJsonFromFile("sample_multi_payload_with_different_time.json", postfix);
jsonBody = updateTimeStampJson(jsonBody, "\"%TIMESTAMP_1%\"", validTime);
Expand All @@ -139,7 +139,11 @@ public void testHttpIngestionPartialInvalidCollectionTime() throws Exception {

try {
assertEquals("Should get status 207 from " + String.format(postMultiPath, TENANT_ID), 207, response.getStatusLine().getStatusCode() );
assertTrue("", errorResponse.getErrors().size() > 0);
for (int i = 0; i < 4; i++) {
assertEquals("Invalid error source", "collectionTime", errorResponse.getErrors().get(i).getSource());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than " + BEFORE_CURRENT_COLLECTIONTIME_MS + " milliseconds into the past." +
" Cannot be more than " + AFTER_CURRENT_COLLECTIONTIME_MS + " milliseconds into the future", errorResponse.getErrors().get(i).getMessage());
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}
finally {
EntityUtils.consume( response.getEntity() ); // Releases connection apparently
Expand All @@ -149,33 +153,31 @@ public void testHttpIngestionPartialInvalidCollectionTime() throws Exception {
@Test
public void testHttpAggregatedIngestionInvalidPastCollectionTime() throws IOException, URISyntaxException {

long timestamp = System.currentTimeMillis() - TIME_DIFF_MS
- Configuration.getInstance().getLongProperty( CoreConfig.BEFORE_CURRENT_COLLECTIONTIME_MS );
long timestamp = System.currentTimeMillis() - TIME_DIFF_MS - BEFORE_CURRENT_COLLECTIONTIME_MS;

HttpResponse response = postMetric("333333", postAggregatedPath, "sample_payload.json", timestamp, getPostfix());
ErrorResponse errorResponse = getErrorResponse(response);

assertEquals(400, response.getStatusLine().getStatusCode());
assertEquals("Number of errors invalid", 1, errorResponse.getErrors().size());
assertEquals("Invalid error source", "timestamp", errorResponse.getErrors().get(0).getSource());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than 259200000 milliseconds into the past." +
" Cannot be more than 600000 milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than " + BEFORE_CURRENT_COLLECTIONTIME_MS + " milliseconds into the past." +
" Cannot be more than " + AFTER_CURRENT_COLLECTIONTIME_MS + " milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
}

@Test
public void testHttpAggregatedIngestionInvalidFutureCollectionTime() throws IOException, URISyntaxException {

long timestamp = System.currentTimeMillis() + TIME_DIFF_MS
+ Configuration.getInstance().getLongProperty( CoreConfig.AFTER_CURRENT_COLLECTIONTIME_MS );
long timestamp = System.currentTimeMillis() + TIME_DIFF_MS + AFTER_CURRENT_COLLECTIONTIME_MS;

HttpResponse response = postMetric("333333", postAggregatedPath, "sample_payload.json", timestamp, getPostfix());
ErrorResponse errorResponse = getErrorResponse(response);

assertEquals(400, response.getStatusLine().getStatusCode());
assertEquals("Number of errors invalid", 1, errorResponse.getErrors().size());
assertEquals("Invalid error source", "timestamp", errorResponse.getErrors().get(0).getSource());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than 259200000 milliseconds into the past." +
" Cannot be more than 600000 milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than " + BEFORE_CURRENT_COLLECTIONTIME_MS + " milliseconds into the past." +
" Cannot be more than " + AFTER_CURRENT_COLLECTIONTIME_MS + " milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
}

@Test
Expand Down Expand Up @@ -207,8 +209,7 @@ locator, RollupType.COUNTER, new Range( start, end ),
@Test
public void testHttpAggregatedMultiIngestionInvalidPastCollectionTime() throws IOException, URISyntaxException {

long timestamp = System.currentTimeMillis() - TIME_DIFF_MS
- Configuration.getInstance().getLongProperty( CoreConfig.BEFORE_CURRENT_COLLECTIONTIME_MS );
long timestamp = System.currentTimeMillis() - TIME_DIFF_MS - BEFORE_CURRENT_COLLECTIONTIME_MS;

String postfix = getPostfix();

Expand All @@ -222,16 +223,15 @@ public void testHttpAggregatedMultiIngestionInvalidPastCollectionTime() throws I

assertEquals("Number of errors invalid", 3, errorResponse.getErrors().size());
assertEquals("Invalid error source", "timestamp", errorResponse.getErrors().get(0).getSource());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than 259200000 milliseconds into the past." +
" Cannot be more than 600000 milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than " + BEFORE_CURRENT_COLLECTIONTIME_MS + " milliseconds into the past." +
" Cannot be more than " + AFTER_CURRENT_COLLECTIONTIME_MS + " milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
}


@Test
public void testHttpAggregatedMultiIngestionInvalidFutureCollectionTime() throws IOException, URISyntaxException {

long timestamp = System.currentTimeMillis() + TIME_DIFF_MS
+ Configuration.getInstance().getLongProperty( CoreConfig.AFTER_CURRENT_COLLECTIONTIME_MS );
long timestamp = System.currentTimeMillis() + TIME_DIFF_MS + AFTER_CURRENT_COLLECTIONTIME_MS;

String postfix = getPostfix();

Expand All @@ -245,8 +245,8 @@ public void testHttpAggregatedMultiIngestionInvalidFutureCollectionTime() throws

assertEquals("Number of errors invalid", 3, errorResponse.getErrors().size());
assertEquals("Invalid error source", "timestamp", errorResponse.getErrors().get(0).getSource());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than 259200000 milliseconds into the past." +
" Cannot be more than 600000 milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than " + BEFORE_CURRENT_COLLECTIONTIME_MS + " milliseconds into the past." +
" Cannot be more than " + AFTER_CURRENT_COLLECTIONTIME_MS + " milliseconds into the future", errorResponse.getErrors().get(0).getMessage());
}

@Test
Expand Down Expand Up @@ -292,8 +292,8 @@ locator2, RollupType.ENUM, new Range(start, end),
public void testHttpAggregatedMultiPartialInvalidCollectionTime() throws Exception {
String postfix = getPostfix();
long validTime = System.currentTimeMillis();
long pastTime = System.currentTimeMillis() - TIME_DIFF_MS - Configuration.getInstance().getLongProperty( CoreConfig.BEFORE_CURRENT_COLLECTIONTIME_MS );
long futureTime = System.currentTimeMillis() + TIME_DIFF_MS + Configuration.getInstance().getLongProperty( CoreConfig.AFTER_CURRENT_COLLECTIONTIME_MS );
long pastTime = System.currentTimeMillis() - TIME_DIFF_MS - BEFORE_CURRENT_COLLECTIONTIME_MS;
long futureTime = System.currentTimeMillis() + TIME_DIFF_MS + AFTER_CURRENT_COLLECTIONTIME_MS;

String jsonBody = getJsonFromFile("sample_multi_aggregated_payload_with_different_time.json", postfix);
jsonBody = updateTimeStampJson(jsonBody, "\"%TIMESTAMP_1%\"", validTime);
Expand All @@ -302,11 +302,15 @@ public void testHttpAggregatedMultiPartialInvalidCollectionTime() throws Excepti
jsonBody = jsonBody.replaceAll("%TENANT_ID_.%", TENANT_ID);

HttpResponse response = httpPost(TENANT_ID, postAggregatedMultiPath, jsonBody );
String[] output = getBodyArray(response);
ErrorResponse errorResponse = getErrorResponse(response);

try {
assertEquals("Should get status 207 from " + String.format(postAggregatedMultiPath, TENANT_ID), 207, response.getStatusLine().getStatusCode() );
assertEquals("", output[0]);
for (int i = 0; i < 2; i++) {
assertEquals("Invalid error source", "timestamp", errorResponse.getErrors().get(i).getSource());
assertEquals("Invalid error message", "Out of bounds. Cannot be more than " + BEFORE_CURRENT_COLLECTIONTIME_MS + " milliseconds into the past." +
" Cannot be more than " + AFTER_CURRENT_COLLECTIONTIME_MS + " milliseconds into the future", errorResponse.getErrors().get(i).getMessage());
}
}
finally {
EntityUtils.consume( response.getEntity() ); // Releases connection apparently
Expand Down Expand Up @@ -472,7 +476,10 @@ public void testMultiTenantPartialFailureWithoutTenant() throws Exception {

try {
assertEquals("Should get status 207 from " + String.format(postMultiPath, TENANT_ID), 207, response.getStatusLine().getStatusCode());
assertTrue("No errors found", errorResponse.getErrors().size() > 0);
for (int i = 0; i < 2; i++) {
assertEquals("Invalid error source", "tenantId", errorResponse.getErrors().get(i).getSource());
assertEquals("Invalid error message", "may not be empty", errorResponse.getErrors().get(i).getMessage());
}
}
finally {
EntityUtils.consume( response.getEntity() ); // Releases connection apparently
Expand Down
2 changes: 1 addition & 1 deletion blueflood-http/src/main/java/com/rackspacecloud/blueflood/http/DefaultHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static void sendErrorResponse(ChannelHandlerContext ctx, FullHttpRequest
final String tenantId = request.headers().get("tenantId");

List<ErrorResponse.ErrorData> errrors = new ArrayList<ErrorResponse.ErrorData>(){{
add(new ErrorResponse.ErrorData(tenantId, null, null, message));
add(new ErrorResponse.ErrorData(tenantId, null, null, message, null));
}};

sendErrorResponse(ctx, request, errrors, status);
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/rackspacecloud/blueflood/inputs/handlers/HttpAggregatedMultiIngestionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ public void handle(ChannelHandlerContext ctx, FullHttpRequest request) {
return;
} else {
// has some validation errors, response MULTI_STATUS
DefaultHandler.sendResponse(ctx, request, null, HttpResponseStatus.MULTI_STATUS);
DefaultHandler.sendErrorResponse(ctx, request, errors, HttpResponseStatus.MULTI_STATUS);
return;
}

Expand Down
6 changes: 4 additions & 2 deletions ...rc/main/java/com/rackspacecloud/blueflood/inputs/handlers/HttpEventsIngestionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ public void handle(ChannelHandlerContext ctx, FullHttpRequest request) {

List<ErrorResponse.ErrorData> validationErrors = new ArrayList<ErrorResponse.ErrorData>();
for (ConstraintViolation<Event> constraintViolation : constraintViolations) {
validationErrors.add(new ErrorResponse.ErrorData(tenantId, "",
constraintViolation.getPropertyPath().toString(), constraintViolation.getMessage()));
validationErrors.add(
new ErrorResponse.ErrorData(tenantId, "",
constraintViolation.getPropertyPath().toString(), constraintViolation.getMessage(),
event.getWhen()));
}

if (!validationErrors.isEmpty()) {
Expand Down
3 changes: 2 additions & 1 deletion ...c/main/java/com/rackspacecloud/blueflood/inputs/handlers/HttpMetricsIngestionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ protected JSONMetricsContainer createContainer(String body, String tenantId) thr
} else {
for (ConstraintViolation<JSONMetric> constraintViolation : constraintViolations) {
validationErrors.add(new ErrorResponse.ErrorData(tenantId, metric.getMetricName(),
constraintViolation.getPropertyPath().toString(), constraintViolation.getMessage()));
constraintViolation.getPropertyPath().toString(), constraintViolation.getMessage(),
metric.getCollectionTime()));
}
}
}
Expand Down
Loading