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

Add missing field to Logging's HttpRequest class #1160

Merged
merged 1 commit into from
Aug 16, 2016
Merged

Add missing field to Logging's HttpRequest class #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
143 changes: 56 additions & 87 deletions gcloud-java-logging/src/main/java/com/google/cloud/logging/HttpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,12 @@ public final class HttpRequest implements Serializable {
private final Long responseSize;
private final String userAgent;
private final String remoteIp;
// todo(mziccard) uncomment when #1042 gets fixed
// private final String serverIp;
private final String serverIp;
private final String referer;
// todo(mziccard) uncomment when #1042 gets fixed
// private final boolean cacheLookup;
private final boolean cacheLookup;
private final boolean cacheHit;
private final boolean cacheValidatedWithOriginServer;
// todo(mziccard) uncomment when #1042 gets fixed
// private final Long cacheFillBytes;
private final Long cacheFillBytes;

/**
* The HTTP request method.
Expand All @@ -72,15 +69,12 @@ public static final class Builder {
private Long responseSize;
private String userAgent;
private String remoteIp;
// todo(mziccard) uncomment when #1042 gets fixed
// private String serverIp;
private String serverIp;
private String referer;
// todo(mziccard) uncomment when #1042 gets fixed
// private boolean cacheLookup;
private boolean cacheLookup;
private boolean cacheHit;
private boolean cacheValidatedWithOriginServer;
// todo(mziccard) uncomment when #1042 gets fixed
// private Long cacheFillBytes;
private Long cacheFillBytes;

Builder() {}

Expand All @@ -92,15 +86,12 @@ public static final class Builder {
this.responseSize = request.responseSize;
this.userAgent = request.userAgent;
this.remoteIp = request.remoteIp;
// todo(mziccard) uncomment when #1042 gets fixed
// this.serverIp = request.serverIp;
this.serverIp = request.serverIp;
this.referer = request.referer;
// todo(mziccard) uncomment when #1042 gets fixed
// this.cacheLookup = request.cacheLookup;
this.cacheLookup = request.cacheLookup;
this.cacheHit = request.cacheHit;
this.cacheValidatedWithOriginServer = request.cacheValidatedWithOriginServer;
// todo(mziccard) uncomment when #1042 gets fixed
// this.cacheFillBytes = request.cacheFillBytes;
this.cacheFillBytes = request.cacheFillBytes;
}

/**
Expand Down Expand Up @@ -169,11 +160,10 @@ public Builder remoteIp(String remoteIp) {
* Sets the IP address (IPv4 or IPv6) of the origin server that the request was sent to.
* Examples: {@code 192.168.1.1}, {@code FE80::0202:B3FF:FE1E:8329}.
*/
// todo(mziccard) uncomment when #1042 gets fixed
//public Builder serverIp(String serverIp) {
// this.serverIp = serverIp;
// return this;
//}
public Builder serverIp(String serverIp) {
this.serverIp = serverIp;
return this;
}

/**
* Sets the referer URL of the request, as defined in HTTP/1.1 Header Field Definitions.
Expand All @@ -189,11 +179,10 @@ public Builder referer(String referer) {
/**
* Sets whether or not a cache lookup was attempted. If not set, {@code false} is used.
*/
// todo(mziccard) uncomment when #1042 gets fixed
//public Builder cacheLookup(boolean cacheLookup) {
// this.cacheLookup = cacheLookup;
// return this;
//}
public Builder cacheLookup(boolean cacheLookup) {
this.cacheLookup = cacheLookup;
return this;
}

/**
* Sets whether or not an entity was served from cache (with or without validation). If not set,
Expand All @@ -218,11 +207,10 @@ public Builder cacheValidatedWithOriginServer(boolean cacheValidatedWithOriginSe
* Sets the number of HTTP response bytes inserted into cache. Set only when a cache fill was
* attempted.
*/
// todo(mziccard) uncomment when #1042 gets fixed
//public Builder cacheFillBytes(long cacheFillBytes) {
// this.cacheFillBytes = cacheFillBytes;
// return this;
//}
public Builder cacheFillBytes(long cacheFillBytes) {
this.cacheFillBytes = cacheFillBytes;
return this;
}

/**
* Creates a {@code HttpRequest} object for this builder.
Expand All @@ -240,15 +228,12 @@ public HttpRequest build() {
this.responseSize = builder.responseSize;
this.userAgent = builder.userAgent;
this.remoteIp = builder.remoteIp;
// todo(mziccard) uncomment when #1042 gets fixed
// this.serverIp = builder.serverIp;
this.serverIp = builder.serverIp;
this.referer = builder.referer;
// todo(mziccard) uncomment when #1042 gets fixed
// this.cacheLookup = builder.cacheLookup;
this.cacheLookup = builder.cacheLookup;
this.cacheHit = builder.cacheHit;
this.cacheValidatedWithOriginServer = builder.cacheValidatedWithOriginServer;
// todo(mziccard) uncomment when #1042 gets fixed
// this.cacheFillBytes = builder.cacheFillBytes;
this.cacheFillBytes = builder.cacheFillBytes;
}

/**
Expand Down Expand Up @@ -310,10 +295,9 @@ public String remoteIp() {
* Returns the IP address (IPv4 or IPv6) of the origin server that the request was sent to.
* Examples: {@code 192.168.1.1}, {@code FE80::0202:B3FF:FE1E:8329}.
*/
// todo(mziccard) uncomment when #1042 gets fixed
//public String serverIp() {
// return serverIp;
//}
public String serverIp() {
return serverIp;
}

/**
* Returns the referer URL of the request, as defined in HTTP/1.1 Header Field Definitions.
Expand All @@ -329,10 +313,9 @@ public String referer() {
* Returns whether or not a cache lookup was attempted. If not set, this method returns
* {@code false}.
*/
// todo(mziccard) uncomment when #1042 gets fixed
//public boolean cacheLookup() {
// return cacheLookup;
//}
public boolean cacheLookup() {
return cacheLookup;
}

/**
* Returns whether or not an entity was served from cache (with or without validation). If not
Expand All @@ -355,17 +338,15 @@ public boolean cacheValidatedWithOriginServer() {
* Returns the number of HTTP response bytes inserted into cache. Set only when a cache fill was
* attempted.
*/
// todo(mziccard) uncomment when #1042 gets fixed
//public Long cacheFillBytes() {
// return cacheFillBytes;
//}
public Long cacheFillBytes() {
return cacheFillBytes;
}

@Override
public int hashCode() {
return Objects.hash(requestMethod, requestUrl, requestSize, status, responseSize, userAgent,
// todo(mziccard) uncomment when #1042 gets fixed
// serverIp, cacheLookup, cacheFillBytes
remoteIp, referer, cacheHit, cacheValidatedWithOriginServer);
serverIp, cacheLookup, cacheFillBytes, remoteIp, referer, cacheHit,
cacheValidatedWithOriginServer);
}

@Override
Expand All @@ -378,15 +359,12 @@ public String toString() {
.add("responseSize", responseSize)
.add("userAgent", userAgent)
.add("remoteIp", remoteIp)
// todo(mziccard) uncomment when #1042 gets fixed
// .add("serverIp", serverIp)
.add("serverIp", serverIp)
.add("referer", referer)
// todo(mziccard) uncomment when #1042 gets fixed
// .add("cacheLookup", cacheLookup)
.add("cacheLookup", cacheLookup)
.add("cacheHit", cacheHit)
.add("cacheValidatedWithOriginServer", cacheValidatedWithOriginServer)
// todo(mziccard) uncomment when #1042 gets fixed
// .add("cacheFillBytes", cacheFillBytes)
.add("cacheFillBytes", cacheFillBytes)
.toString();
}

Expand All @@ -406,15 +384,12 @@ public boolean equals(Object obj) {
&& Objects.equals(responseSize, other.responseSize)
&& Objects.equals(userAgent, other.userAgent)
&& Objects.equals(remoteIp, other.remoteIp)
// todo(mziccard) uncomment when #1042 gets fixed
// && Objects.equals(serverIp, other.serverIp)
&& Objects.equals(serverIp, other.serverIp)
&& Objects.equals(referer, other.referer)
// todo(mziccard) uncomment when #1042 gets fixed
// && cacheLookup == other.cacheLookup
&& cacheLookup == other.cacheLookup
&& cacheHit == other.cacheHit
&& cacheValidatedWithOriginServer == other.cacheValidatedWithOriginServer;
// todo(mziccard) uncomment when #1042 gets fixed
// && Objects.equals(cacheFillBytes, other.cacheFillBytes);
&& cacheValidatedWithOriginServer == other.cacheValidatedWithOriginServer
&& Objects.equals(cacheFillBytes, other.cacheFillBytes);
}

/**
Expand Down Expand Up @@ -448,21 +423,18 @@ com.google.logging.type.HttpRequest toPb() {
if (remoteIp != null) {
builder.setRemoteIp(remoteIp);
}
// todo(mziccard) uncomment when #1042 gets fixed
// if (serverIp != null) {
// builder.setServerIp(serverIp);
//}
if (serverIp != null) {
builder.setServerIp(serverIp);
}
if (referer != null) {
builder.setReferer(referer);
}
// todo(mziccard) uncomment when #1042 gets fixed
// builder.setCacheLookup(cacheLookup);
builder.setCacheLookup(cacheLookup);
builder.setCacheHit(cacheHit);
builder.setCacheValidatedWithOriginServer(cacheValidatedWithOriginServer);
// todo(mziccard) uncomment when #1042 gets fixed
//if (cacheFillBytes != null) {
// builder.setCacheFillBytes(cacheFillBytes);
//}
if (cacheFillBytes != null) {
builder.setCacheFillBytes(cacheFillBytes);
}
return builder.build();
}

Expand Down Expand Up @@ -493,24 +465,21 @@ static HttpRequest fromPb(com.google.logging.type.HttpRequest requestPb) {
if (requestPb.getUserAgent() != null && !requestPb.getRequestUrl().equals("")) {
builder.userAgent(requestPb.getUserAgent());
}
// todo(mziccard) uncomment when #1042 gets fixed
//if (requestPb.getServerIp() != null && !requestPb.getServerIp().equals("")) {
// builder.serverIp(requestPb.getServerIp());
//}
if (requestPb.getServerIp() != null && !requestPb.getServerIp().equals("")) {
builder.serverIp(requestPb.getServerIp());
}
if (requestPb.getRemoteIp() != null && !requestPb.getRemoteIp().equals("")) {
builder.remoteIp(requestPb.getRemoteIp());
}
if (requestPb.getReferer() != null && !requestPb.getReferer().equals("")) {
builder.referer(requestPb.getReferer());
}
// todo(mziccard) uncomment when #1042 gets fixed
// builder.cacheLookup(requestPb.getCacheLookup());
builder.cacheLookup(requestPb.getCacheLookup());
builder.cacheHit(requestPb.getCacheHit());
builder.cacheValidatedWithOriginServer(requestPb.getCacheValidatedWithOriginServer());
// todo(mziccard) uncomment when #1042 gets fixed
//if (requestPb.getCacheFillBytes() != 0L) {
// builder.cacheFillBytes(requestPb.getCacheFillBytes());
//}
if (requestPb.getCacheFillBytes() != 0L) {
builder.cacheFillBytes(requestPb.getCacheFillBytes());
}
return builder.build();
}
}
Loading