Skip to content

Commit

Permalink
Revert "Enhance OpenCensus tracing instrumentation."
Browse files Browse the repository at this point in the history 
This reverts commit d93eb99.
  • Loading branch information
@jeanbza
jeanbza committed Jun 25, 2018
1 parent 35d2a00 commit 36280df
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 230 deletions.
16 changes: 6 additions & 10 deletions google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@ static String executeAndGetValueOfSomeCustomHeader(HttpRequest request) {
/** OpenCensus tracing component. */
private Tracer tracer = OpenCensusUtils.getTracer();

/** Prefix for tracing span name. */
private static final String traceSpanNamePrefix = "Sent." + HttpRequest.class.getName() + ".";

/**
* @param transport HTTP transport
* @param requestMethod HTTP request method or {@code null} for none
Expand Down Expand Up @@ -862,12 +865,9 @@ public HttpResponse execute() throws IOException {
Preconditions.checkNotNull(requestMethod);
Preconditions.checkNotNull(url);

Span span = tracer
.spanBuilder(OpenCensusUtils.SPAN_NAME_HTTP_REQUEST_EXECUTE)
.setRecordEvents(OpenCensusUtils.isRecordEvent())
.startSpan();
Span span = tracer.spanBuilder(traceSpanNamePrefix + "execute").startSpan();
do {
span.addAnnotation("retry #" + (numRetries - retriesRemaining));
span.addAnnotation("retry #" + numRetries);
// Cleanup any unneeded response from a previous iteration
if (response != null) {
response.ignore();
Expand Down Expand Up @@ -911,7 +911,7 @@ public HttpResponse execute() throws IOException {
headers.setUserAgent(originalUserAgent + " " + USER_AGENT_SUFFIX);
}
}
OpenCensusUtils.propagateTracingContext(span, headers);
OpenCensusUtils.propagateTracingContext(headers);

// headers
HttpHeaders.serializeHeaders(headers, logbuf, curlbuf, logger, lowLevelHttpRequest);
Expand Down Expand Up @@ -995,12 +995,8 @@ public HttpResponse execute() throws IOException {
// switch tracing scope to current span
@SuppressWarnings("MustBeClosedChecker")
Scope ws = tracer.withSpan(span);
OpenCensusUtils.recordSentMessageEvent(span, lowLevelHttpRequest.getContentLength());
try {
LowLevelHttpResponse lowLevelHttpResponse = lowLevelHttpRequest.execute();
if (lowLevelHttpResponse != null) {
OpenCensusUtils.recordReceivedMessageEvent(span, lowLevelHttpResponse.getContentLength());
}
// Flag used to indicate if an exception is thrown before the response is constructed.
boolean responseConstructed = false;
try {
Expand Down
138 changes: 16 additions & 122 deletions google-http-client/src/main/java/com/google/api/client/util/OpenCensusUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,79 +15,53 @@
package com.google.api.client.util;

import com.google.api.client.http.HttpHeaders;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpResponse;
import com.google.api.client.http.HttpStatusCodes;
import com.google.common.annotations.VisibleForTesting;

import io.opencensus.contrib.http.util.HttpPropagationUtil;
import io.opencensus.trace.BlankSpan;
import io.opencensus.trace.EndSpanOptions;
import io.opencensus.trace.NetworkEvent;
import io.opencensus.trace.NetworkEvent.Type;
import io.opencensus.trace.Span;
import io.opencensus.trace.Status;
import io.opencensus.trace.Tracer;
import io.opencensus.trace.Tracing;
import io.opencensus.trace.propagation.TextFormat;

import java.util.Collections;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.annotation.Nullable;

/**
* Utilities for Census monitoring and tracing.
*
* @author Hailong Wen
* @since 1.24
* @author Hailong Wen
*/
public class OpenCensusUtils {

private static final Logger logger = Logger.getLogger(OpenCensusUtils.class.getName());

/**
* Span name for tracing {@link HttpRequest#execute()}.
*/
public static final String SPAN_NAME_HTTP_REQUEST_EXECUTE =
"Sent." + HttpRequest.class.getName() + ".execute";

/**
* OpenCensus tracing component. When no OpenCensus implementation is provided, it will return a
* no-op tracer.
*/
private static Tracer tracer = Tracing.getTracer();

/**
* Sequence id generator for message event.
*/
private static AtomicLong idGenerator = new AtomicLong();
private static final Logger LOGGER = Logger.getLogger(OpenCensusUtils.class.getName());

/**
* Whether spans should be recorded locally. Defaults to true.
* OpenCensus tracing component.
* When no OpenCensus implementation is provided, it will return a no-op tracer.
*/
private static volatile boolean isRecordEvent = true;
static Tracer tracer = Tracing.getTracer();

/**
* {@link TextFormat} used in tracing context propagation.
*/
@Nullable
@VisibleForTesting
static volatile TextFormat propagationTextFormat = null;
static TextFormat propagationTextFormat = null;

/**
* {@link TextFormat.Setter} for {@link #propagationTextFormat}.
* {@link TextFormat.Setter} for {@link activeTextFormat}.
*/
@Nullable
@VisibleForTesting
static volatile TextFormat.Setter propagationTextFormatSetter = null;
static TextFormat.Setter propagationTextFormatSetter = null;

/**
* Sets the {@link TextFormat} used in context propagation.
*
* <p>This API allows users of google-http-client to specify other text format, or disable context
* propagation by setting it to {@code null}. It should be used along with {@link
* #setPropagationTextFormatSetter} for setting purpose. </p>
*
* @param textFormat the text format.
*/
public static void setPropagationTextFormat(@Nullable TextFormat textFormat) {
Expand All @@ -96,28 +70,12 @@ public static void setPropagationTextFormat(@Nullable TextFormat textFormat) {

/**
* Sets the {@link TextFormat.Setter} used in context propagation.
*
* <p>This API allows users of google-http-client to specify other text format setter, or disable
* context propagation by setting it to {@code null}. It should be used along with {@link
* #setPropagationTextFormat} for setting purpose. </p>
*
* @param textFormatSetter the {@code TextFormat.Setter} for the text format.
*/
public static void setPropagationTextFormatSetter(@Nullable TextFormat.Setter textFormatSetter) {
propagationTextFormatSetter = textFormatSetter;
}

/**
* Sets whether spans should be recorded locally.
*
* <p> This API allows users of google-http-client to turn on/off local span collection. </p>
*
* @param recordEvent record span locally if true.
*/
public static void setIsRecordEvent(boolean recordEvent) {
isRecordEvent = recordEvent;
}

/**
* Returns the tracing component of OpenCensus.
*
Expand All @@ -127,27 +85,15 @@ public static Tracer getTracer() {
return tracer;
}

/**
* Returns whether spans should be recorded locally.
*
* @return whether spans should be recorded locally.
*/
public static boolean isRecordEvent() {
return isRecordEvent;
}

/**
* Propagate information of current tracing context. This information will be injected into HTTP
* header.
*
* @param span the span to be propagated.
* @param headers the headers used in propagation.
*/
public static void propagateTracingContext(Span span, HttpHeaders headers) {
Preconditions.checkArgument(span != null, "span should not be null.");
Preconditions.checkArgument(headers != null, "headers should not be null.");
public static void propagateTracingContext(HttpHeaders headers) {
Preconditions.checkNotNull(headers);
if (propagationTextFormat != null && propagationTextFormatSetter != null) {
if (!span.equals(BlankSpan.INSTANCE)) {
Span span = tracer.getCurrentSpan();
if (span != null && !span.equals(BlankSpan.INSTANCE)) {
propagationTextFormat.inject(span.getContext(), headers, propagationTextFormatSetter);
}
}
Expand All @@ -161,7 +107,7 @@ public static void propagateTracingContext(Span span, HttpHeaders headers) {
*/
public static EndSpanOptions getEndSpanOptions(@Nullable Integer statusCode) {
// Always sample the span, but optionally export it.
EndSpanOptions.Builder builder = EndSpanOptions.builder();
EndSpanOptions.Builder builder = EndSpanOptions.builder().setSampleToLocalSpanStore(true);
if (statusCode == null) {
builder.setStatus(Status.UNKNOWN);
} else if (!HttpStatusCodes.isSuccess(statusCode)) {
Expand Down Expand Up @@ -193,49 +139,6 @@ public static EndSpanOptions getEndSpanOptions(@Nullable Integer statusCode) {
return builder.build();
}

/**
* Records a new message event which contains the size of the request content. Note that the size
* represents the message size in application layer, i.e., content-length.
*
* @param span The {@code span} in which the send event occurs.
* @param size Size of the request.
*/
public static void recordSentMessageEvent(Span span, long size) {
recordMessageEvent(span, size, Type.SENT);
}

/**
* Records a new message event which contains the size of the response content. Note that the size
* represents the message size in application layer, i.e., content-length.
*
* @param span The {@code span} in which the receive event occurs.
* @param size Size of the response.
*/
public static void recordReceivedMessageEvent(Span span, long size) {
recordMessageEvent(span, size, Type.RECV);
}

/**
* Records a message event of a certain {@link NetowrkEvent.Type}. This method is package
* protected since {@link NetworkEvent} might be deprecated in future releases.
*
* @param span The {@code span} in which the event occurs.
* @param size Size of the message.
* @param eventType The {@code NetworkEvent.Type} of the message event.
*/
@VisibleForTesting
static void recordMessageEvent(Span span, long size, Type eventType) {
Preconditions.checkArgument(span != null, "span should not be null.");
if (size < 0) {
size = 0;
}
NetworkEvent event = NetworkEvent
.builder(eventType, idGenerator.getAndIncrement())
.setUncompressedMessageSize(size)
.build();
span.addNetworkEvent(event);
}

static {
try {
propagationTextFormat = HttpPropagationUtil.getCloudTraceFormat();
Expand All @@ -246,16 +149,7 @@ public void put(HttpHeaders carrier, String key, String value) {
}
};
} catch (Exception e) {
logger.log(
Level.WARNING, "Cannot initialize default OpenCensus HTTP propagation text format.", e);
}

try {
Tracing.getExportComponent().getSampledSpanStore().registerSpanNamesForCollection(
Collections.<String>singletonList(SPAN_NAME_HTTP_REQUEST_EXECUTE));
} catch (Exception e) {
logger.log(
Level.WARNING, "Cannot register default OpenCensus span names for collection.", e);
LOGGER.log(Level.WARNING, "Cannot initiate OpenCensus modules, tracing disabled", e);
}
}

Expand Down
Loading

0 comments on commit 36280df

Please sign in to comment.