From 561eb0fcd99fcfb4dd6c85a743f4e69126a7f8c6 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Thu, 26 Jul 2018 16:01:27 +1000 Subject: [PATCH] Update span types to be consistent with other tracers --- .../src/main/java/datadog/trace/api/DDSpanTypes.java | 5 +++++ .../datadog/opentracing/decorators/DBTypeDecorator.java | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java b/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java index 0243134634..495b9fdf44 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/DDSpanTypes.java @@ -1,13 +1,18 @@ package datadog.trace.api; public class DDSpanTypes { + public static final String HTTP_SERVER = "http"; public static final String HTTP_CLIENT = "http"; public static final String WEB_SERVLET = "web"; public static final String RPC = "rpc"; + public static final String CACHE = "cache"; public static final String SQL = "sql"; public static final String MONGO = "mongodb"; public static final String CASSANDRA = "cassandra"; + public static final String REDIS = "redis"; + public static final String MEMCACHED = "memcached"; + public static final String ELASTICSEARCH = "elasticsearch"; public static final String MESSAGE_CONSUMER = "queue"; public static final String MESSAGE_PRODUCER = "queue"; diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java index 032f3a2f2a..2b86673250 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/decorators/DBTypeDecorator.java @@ -1,6 +1,7 @@ package datadog.opentracing.decorators; import datadog.opentracing.DDSpanContext; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.opentracing.tag.Tags; @@ -25,13 +26,13 @@ public class DBTypeDecorator extends AbstractDecorator { // Special case: Mongo, set to mongodb if ("mongo".equals(value)) { // Todo: not sure it's used cos already in the agent mongo helper - context.setSpanType("mongodb"); + context.setSpanType(DDSpanTypes.MONGO); } else if ("cassandra".equals(value)) { - context.setSpanType("cassandra"); + context.setSpanType(DDSpanTypes.CASSANDRA); } else if ("memcached".equals(value)) { - context.setSpanType("cache"); + context.setSpanType(DDSpanTypes.MEMCACHED); } else { - context.setSpanType("sql"); + context.setSpanType(DDSpanTypes.SQL); } // Works for: mongo, cassandra, jdbc context.setOperationName(String.valueOf(value) + ".query");