From 9a9014174d4d04d29f96aa9c534881dcf5fd09dc Mon Sep 17 00:00:00 2001 From: wusheng Date: Sun, 19 Feb 2017 19:13:41 +0800 Subject: [PATCH] Refactor tags. --- .../com/a/eye/skywalking/trace/tag/Tags.java | 46 ++++++++++--------- .../plugin/jdbc/PreparedStatementTracing.java | 2 +- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java index d1f51cdb2..d66701961 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java @@ -13,17 +13,17 @@ public final class Tags { } /** - * URL records the url of the incoming request. + * URL records the url of the incoming request. */ public static final StringTag URL = new StringTag("url"); /** - * STATUS_CODE records the http status code of the response. + * STATUS_CODE records the http status code of the response. */ public static final IntTag STATUS_CODE = new IntTag("status_code"); /** - * SPAN_KIND hints at the relationship between spans, e.g. client/server. + * SPAN_KIND hints at the relationship between spans, e.g. client/server. */ public static final StringTag SPAN_KIND = new StringTag("span.kind"); @@ -38,59 +38,63 @@ public final class Tags { public static final String SPAN_KIND_CLIENT = "client"; /** - * SPAN_LAYER represents the kind of span. - * e.g. db=database; rpc=Remote Procedure Call Framework, like motan, thift; nosql=something like redis/memcache + * SPAN_LAYER represents the kind of span. + * + * e.g. + * db=database; + * rpc=Remote Procedure Call Framework, like motan, thift; + * nosql=something like redis/memcache */ public static final class SPAN_LAYER { private static StringTag SPAN_LAYER_TAG = new StringTag("span.layer"); - private static final String RDB_LAYER = "rda"; + private static final String RDB_LAYER = "rdb"; private static final String RPC_FRAMEWORK_LAYER = "rpc"; private static final String NOSQL_LAYER = "nosql"; private static final String HTTP_LAYER = "http"; - public static void asDBAccess(Span span){ + public static void asRDB(Span span) { SPAN_LAYER_TAG.set(span, RDB_LAYER); } - public static void asRPCFramework(Span span){ + public static void asRPCFramework(Span span) { SPAN_LAYER_TAG.set(span, RPC_FRAMEWORK_LAYER); } - public static void asNoSQL(Span span){ + public static void asNoSQL(Span span) { SPAN_LAYER_TAG.set(span, NOSQL_LAYER); } - public static void asHttp(Span span){ + public static void asHttp(Span span) { SPAN_LAYER_TAG.set(span, HTTP_LAYER); } - public static String get(Span span){ + public static String get(Span span) { return SPAN_LAYER_TAG.get(span); } - public static boolean isDBAccess(Span span){ + public static boolean isRDB(Span span) { return RDB_LAYER.equals(get(span)); } - public static boolean isRPCFramework(Span span){ + public static boolean isRPCFramework(Span span) { return RPC_FRAMEWORK_LAYER.equals(get(span)); } - public static boolean isNoSQL(Span span){ + public static boolean isNoSQL(Span span) { return NOSQL_LAYER.equals(get(span)); } - public static boolean isHttp(Span span){ + public static boolean isHttp(Span span) { return HTTP_LAYER.equals(get(span)); } } /** - * COMPONENT is a low-cardinality identifier of the module, library, or package that is instrumented. - * Like dubbo/dubbox/motan + * COMPONENT is a low-cardinality identifier of the module, library, or package that is instrumented. + * Like dubbo/dubbox/motan */ - public static final StringTag COMPONENT = new StringTag("component"); + public static final StringTag COMPONENT = new StringTag("component"); /** * ERROR indicates whether a Span ended in an error state. @@ -98,17 +102,17 @@ public final class Tags { public static final BooleanTag ERROR = new BooleanTag("error"); /** - * PEER_HOST records host address of the peer, maybe IPV4, IPV6 or hostname. + * PEER_HOST records host address of the peer, maybe IPV4, IPV6 or hostname. */ public static final StringTag PEER_HOST = new StringTag("peer.host"); /** - * DB_URL records the url of the database access. + * DB_URL records the url of the database access. */ public static final StringTag DB_URL = new StringTag("db.url"); /** - * DB_STATEMENT records the sql statement of the database access. + * DB_STATEMENT records the sql statement of the database access. */ public static final StringTag DB_STATEMENT = new StringTag("db.statement"); } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java index 115afe1b7..2790e0979 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java @@ -17,7 +17,7 @@ public class PreparedStatementTracing { throws SQLException { Span span = ContextManager.INSTANCE.createSpan("JDBC/PreparedStatement/" + method); try { - Tags.SPAN_LAYER.asDBAccess(span); + Tags.SPAN_LAYER.asRDB(span); Tags.DB_URL.set(span, connectInfo); Tags.DB_STATEMENT.set(span, sql); return exec.exe(realStatement, sql);