Skip to content

Remove Jackson from AWS Helper class #247

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
realark merged 1 commit into from
Mar 2, 2018
Merged

Remove Jackson from AWS Helper class #247

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
35 changes: 29 additions & 6 deletions ...nstrumentation/aws-sdk/src/main/java/datadog/trace/instrumentation/aws/SpanDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,16 @@
import com.amazonaws.AmazonWebServiceResponse;
import com.amazonaws.Request;
import com.amazonaws.Response;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.opentracing.Span;
import io.opentracing.tag.Tags;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

class SpanDecorator {
private static final ObjectMapper MAPPER = new ObjectMapper();

static final String COMPONENT_NAME = "java-aws-sdk";

static void onRequest(final Request request, final Span span) {
Expand All @@ -38,9 +36,34 @@ static void onRequest(final Request request, final Span span) {
span.setTag("aws.service", request.getServiceName());
span.setTag("aws.operation", request.getOriginalRequest().getClass().getSimpleName());
span.setTag("aws.endpoint", request.getEndpoint().toString());

try {
span.setTag("params", MAPPER.writeValueAsString(request.getParameters()));
} catch (final JsonProcessingException e) {
StringBuilder params = new StringBuilder("{");
final Map<String, List<Object>> requestParams = request.getParameters();
boolean firstKey = true;
for (Entry<String, List<Object>> entry : requestParams.entrySet()) {
if (!firstKey) {
params.append(",");
}
params.append(entry.getKey()).append("=[");
for (int i = 0; i < entry.getValue().size(); ++i) {
if (i > 0) {
params.append(",");
}
params.append(entry.getValue().get(i));
}
params.append("]");
firstKey = false;
}
params.append("}");
span.setTag("params", params.toString());
} catch (Exception e) {
try {
org.slf4j.LoggerFactory.getLogger(SpanDecorator.class)
.debug("Failed to decorate aws span", e);
} catch (Exception e2) {
// can't reach logger. Silently eat excetpion.
}
}
}

Expand Down