Skip to content

TraceLoggingEnhancer, MonitoredResourceUtil public methods reverted to 1.0.0 surface. #2032

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

Merged
garrettjonesgoogle merged 2 commits into from
May 4, 2017
Merged

TraceLoggingEnhancer, MonitoredResourceUtil public methods reverted to 1.0.0 surface. #2032

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
8248cdb
fixing un-intended breaking changes in logging api surface
jabubake May 4, 2017
3ba981b
javadoc typo
jabubake May 4, 2017
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
2 changes: 1 addition & 1 deletion google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ public LoggingHandler(

this.enhancers.addAll(enhancersParam);

List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.createResourceEnhancers();
List<LoggingEnhancer> loggingEnhancers = MonitoredResourceUtil.getResourceEnhancers();
if (loggingEnhancers != null) {
this.enhancers.addAll(loggingEnhancers);
}
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-logging/src/main/java/com/google/cloud/logging/MonitoredResourceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ public static MonitoredResource getResource(String projectId, String resourceTyp
/**
* Returns custom log entry enhancers (if available) for resource type.
*
* @return custom long entry enhancers
* @return custom log entry enhancers
*/
public static List<LoggingEnhancer> createResourceEnhancers() {
public static List<LoggingEnhancer> getResourceEnhancers() {
Resource resourceType = getAutoDetectedResourceType();
return createEnhancers(resourceType);
}
Expand Down
7 changes: 6 additions & 1 deletion google-cloud-logging/src/main/java/com/google/cloud/logging/TraceLoggingEnhancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,15 @@
/* Adds tracing support for logging with thread-local trace ID tracking. */
public class TraceLoggingEnhancer implements LoggingEnhancer {

private final static String TRACE_ID = "trace_id";
private final String traceIdLabel;

public TraceLoggingEnhancer() {
traceIdLabel = TRACE_ID;
}

public TraceLoggingEnhancer(String prefix) {
this.traceIdLabel = (prefix != null) ? prefix + "trace_id" : "";
traceIdLabel = (prefix != null) ? prefix + TRACE_ID : TRACE_ID;
}

private static final ThreadLocal<String> traceId = new ThreadLocal<>();
Expand Down