Skip to content

Commit 636eb44

Browse files
darinhowarddarinhoward
committed
Fixing date formatting issue on log error
1 parent 70a57ba commit 636eb44

File tree

6 files changed

+173
-177
lines changed

6 files changed

+173
-177
lines changed

‎src/main/java/com/stackify/api/StackifyError.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import lombok.Data;
2424
import lombok.NoArgsConstructor;
2525

26-
import java.util.Date;
2726
import java.util.Map;
2827

2928
/**
@@ -60,7 +59,7 @@ public class StackifyError {
6059
* Date/time of the error
6160
*/
6261
@JsonProperty("OccurredEpochMillis")
63-
private Date occurredEpochMillis;
62+
private Long occurredEpochMillis;
6463

6564
/**
6665
* Error details

‎src/main/java/com/stackify/api/common/log/direct/LogEventAdapter.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import com.stackify.api.common.util.Maps;
2727
import com.stackify.api.common.util.Preconditions;
2828

29-
import java.util.Date;
30-
3129
/**
3230
* LogEvent
3331
* @author Eric Martin
@@ -38,7 +36,7 @@ public class LogEventAdapter implements EventAdapter<LogEvent> {
3836
* Environment detail
3937
*/
4038
private final EnvironmentDetail envDetail;
41-
39+
4240
/**
4341
* Constructor
4442
* @param envDetail Environment detail
@@ -47,7 +45,7 @@ public LogEventAdapter(final EnvironmentDetail envDetail) {
4745
Preconditions.checkNotNull(envDetail);
4846
this.envDetail = envDetail;
4947
}
50-
48+
5149
/**
5250
* @see com.stackify.api.common.log.EventAdapter#getThrowable(java.lang.Object)
5351
*/
@@ -62,9 +60,9 @@ public Throwable getThrowable(final LogEvent event) {
6260
@Override
6361
public StackifyError getStackifyError(final LogEvent event, final Throwable exception) {
6462
StackifyError.Builder builder = StackifyError.newBuilder();
65-
builder.environmentDetail(envDetail);
66-
builder.occurredEpochMillis(new Date(event.getTimestamp()));
67-
63+
builder.environmentDetail(envDetail);
64+
builder.occurredEpochMillis( event.getTimestamp());
65+
6866
if (exception != null) {
6967
builder.error(Throwables.toErrorItem(event.getMessage(), exception));
7068
} else {
@@ -76,15 +74,15 @@ public StackifyError getStackifyError(final LogEvent event, final Throwable exce
7674
if (user != null) {
7775
builder.userName(user);
7876
}
79-
77+
8078
WebRequestDetail webRequest = APMLogData.isLinked() ? APMLogData.getWebRequest() : ServletLogContext.getWebRequest();
8179

8280
if (webRequest != null) {
8381
builder.webRequestDetail(webRequest);
8482
}
8583

8684
builder.serverVariables(Maps.fromProperties(System.getProperties()));
87-
85+
8886
return builder.build();
8987
}
9088

@@ -97,7 +95,7 @@ public LogMsg getLogMsg(final LogEvent event, final StackifyError error) {
9795
builder.msg(event.getMessage());
9896
builder.ex(error);
9997
builder.epochMs(event.getTimestamp());
100-
98+
10199
if (event.getLevel() != null) {
102100
builder.level(event.getLevel().toLowerCase());
103101
}
@@ -107,7 +105,7 @@ public LogMsg getLogMsg(final LogEvent event, final StackifyError error) {
107105
if (transactionId != null) {
108106
builder.transId(transactionId);
109107
}
110-
108+
111109
return builder.build();
112110
}
113111

@@ -119,7 +117,7 @@ public boolean isErrorLevel(final LogEvent event) {
119117
if (event.getLevel() != null) {
120118
return "ERROR".equals(event.getLevel().toUpperCase());
121119
}
122-
120+
123121
return false;
124122
}
125123

‎src/main/java/com/stackify/api/common/proto/LogGroupConverter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import lombok.NonNull;
1313

1414
import java.util.ArrayList;
15-
import java.util.Date;
1615
import java.util.List;
1716

1817
/**
@@ -84,7 +83,7 @@ private static EnvironmentDetail convert(@NonNull final StackifyProto.LogGroup.L
8483
private static StackifyError convert(@NonNull final StackifyProto.LogGroup.Log.Error error) {
8584
return StackifyError.newBuilder()
8685
.environmentDetail(error.hasEnvironmentDetail() ? convert(error.getEnvironmentDetail()) : null)
87-
.occurredEpochMillis(new Date(error.getDateMillis()))
86+
.occurredEpochMillis(error.getDateMillis())
8887
.error(error.hasErrorItem() ? convert(error.getErrorItem()) : null)
8988
.webRequestDetail(error.hasWebRequestDetail() ? convert(error.getWebRequestDetail()) : null)
9089
.serverVariables(error.getServerVariablesMap())

‎src/main/java/com/stackify/api/common/proto/LogMsgGroupConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ private static StackifyProto.LogGroup.Log.Error convert(@NonNull final StackifyE
148148
builder.setEnvironmentDetail(convert(stackifyError.getEnvironmentDetail()));
149149
}
150150
if (stackifyError.getOccurredEpochMillis() != null) {
151-
builder.setDateMillis(stackifyError.getOccurredEpochMillis().getTime());
151+
builder.setDateMillis(stackifyError.getOccurredEpochMillis());
152152
}
153153
if (stackifyError.getError() != null) {
154154
builder.setErrorItem(convert(stackifyError.getError()));

‎src/test/java/com/stackify/api/StackifyErrorTest.java‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,63 +15,63 @@
1515
*/
1616
package com.stackify.api;
1717

18+
import org.junit.Assert;
19+
import org.junit.Test;
20+
1821
import java.util.Collections;
1922
import java.util.Date;
2023
import java.util.Map;
2124

22-
import org.junit.Assert;
23-
import org.junit.Test;
24-
2525
/**
2626
* StackifyError JUnit Test
2727
*
2828
* @author Eric Martin
2929
*/
3030
public class StackifyErrorTest {
3131

32-
/**
33-
* testBuilder
34-
*/
35-
@Test
36-
public void testBuilder() {
37-
EnvironmentDetail environment = EnvironmentDetail.newBuilder().build();
38-
Date timeStamp = new Date();
39-
ErrorItem errorDetail = ErrorItem.newBuilder().build();
40-
WebRequestDetail webRequestDetail = WebRequestDetail.newBuilder().build();
41-
Map<String, String> serverVariables = Collections.singletonMap("serverKey", "serverValue");
42-
String customerName = "customerName";
43-
String userName = "userName";
32+
/**
33+
* testBuilder
34+
*/
35+
@Test
36+
public void testBuilder() {
37+
EnvironmentDetail environment = EnvironmentDetail.newBuilder().build();
38+
Date timeStamp = new Date();
39+
ErrorItem errorDetail = ErrorItem.newBuilder().build();
40+
WebRequestDetail webRequestDetail = WebRequestDetail.newBuilder().build();
41+
Map<String, String> serverVariables = Collections.singletonMap("serverKey", "serverValue");
42+
String customerName = "customerName";
43+
String userName = "userName";
44+
45+
StackifyError.Builder builder = StackifyError.newBuilder();
46+
builder.environmentDetail(environment);
47+
builder.occurredEpochMillis(timeStamp.getTime());
48+
builder.error(errorDetail);
49+
builder.webRequestDetail(webRequestDetail);
50+
builder.serverVariables(serverVariables);
51+
builder.customerName(customerName);
52+
builder.userName(userName);
53+
StackifyError stackifyError = builder.build();
54+
55+
Assert.assertNotNull(stackifyError);
4456

45-
StackifyError.Builder builder = StackifyError.newBuilder();
46-
builder.environmentDetail(environment);
47-
builder.occurredEpochMillis(timeStamp);
48-
builder.error(errorDetail);
49-
builder.webRequestDetail(webRequestDetail);
50-
builder.serverVariables(serverVariables);
51-
builder.customerName(customerName);
52-
builder.userName(userName);
53-
StackifyError stackifyError = builder.build();
57+
Assert.assertEquals(environment, stackifyError.getEnvironmentDetail());
58+
Assert.assertEquals(timeStamp.getTime(), (long) stackifyError.getOccurredEpochMillis());
59+
Assert.assertEquals(errorDetail, stackifyError.getError());
60+
Assert.assertEquals(webRequestDetail, stackifyError.getWebRequestDetail());
61+
Assert.assertEquals(serverVariables, stackifyError.getServerVariables());
62+
Assert.assertEquals(customerName, stackifyError.getCustomerName());
63+
Assert.assertEquals(userName, stackifyError.getUserName());
5464

55-
Assert.assertNotNull(stackifyError);
65+
StackifyError stackifyErrorCopy = stackifyError.toBuilder().build();
5666

57-
Assert.assertEquals(environment, stackifyError.getEnvironmentDetail());
58-
Assert.assertEquals(timeStamp, stackifyError.getOccurredEpochMillis());
59-
Assert.assertEquals(errorDetail, stackifyError.getError());
60-
Assert.assertEquals(webRequestDetail, stackifyError.getWebRequestDetail());
61-
Assert.assertEquals(serverVariables, stackifyError.getServerVariables());
62-
Assert.assertEquals(customerName, stackifyError.getCustomerName());
63-
Assert.assertEquals(userName, stackifyError.getUserName());
64-
65-
StackifyError stackifyErrorCopy = stackifyError.toBuilder().build();
66-
67-
Assert.assertNotNull(stackifyErrorCopy);
67+
Assert.assertNotNull(stackifyErrorCopy);
6868

69-
Assert.assertEquals(environment, stackifyErrorCopy.getEnvironmentDetail());
70-
Assert.assertEquals(timeStamp, stackifyErrorCopy.getOccurredEpochMillis());
71-
Assert.assertEquals(errorDetail, stackifyErrorCopy.getError());
72-
Assert.assertEquals(webRequestDetail, stackifyErrorCopy.getWebRequestDetail());
73-
Assert.assertEquals(serverVariables, stackifyErrorCopy.getServerVariables());
74-
Assert.assertEquals(customerName, stackifyErrorCopy.getCustomerName());
75-
Assert.assertEquals(userName, stackifyErrorCopy.getUserName());
76-
}
69+
Assert.assertEquals(environment, stackifyErrorCopy.getEnvironmentDetail());
70+
Assert.assertEquals(timeStamp.getTime(), (long) stackifyErrorCopy.getOccurredEpochMillis());
71+
Assert.assertEquals(errorDetail, stackifyErrorCopy.getError());
72+
Assert.assertEquals(webRequestDetail, stackifyErrorCopy.getWebRequestDetail());
73+
Assert.assertEquals(serverVariables, stackifyErrorCopy.getServerVariables());
74+
Assert.assertEquals(customerName, stackifyErrorCopy.getCustomerName());
75+
Assert.assertEquals(userName, stackifyErrorCopy.getUserName());
76+
}
7777
}

0 commit comments

Comments
 (0)