From 651323af36b3ea70674d28458ab556857cc3d7b8 Mon Sep 17 00:00:00 2001 From: Chisu Yu Date: Tue, 27 Nov 2012 02:10:47 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9C=A0=EC=B9=98=EC=88=98]=20[NOBTS]=20add?= =?UTF-8?q?=20terminal=20info,=20change=20dbtype=20to=20servicetype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-tomcat-profiler/trunk@918 84d0f5b1-2673-498c-a247-62c4ff18d310 --- src/main/java/com/profiler/context/Span.java | 12 +++ src/main/java/com/profiler/context/Trace.java | 6 +- .../arcus/interceptors/AddOpInterceptor.java | 4 - .../ExecuteMethodInterceptor.java | 3 +- .../Execute2MethodInterceptor.java | 3 +- .../ExecuteMethodInterceptor.java | 6 +- .../interceptor/DriverConnectInterceptor.java | 2 +- .../PreparedStatementCreateInterceptor.java | 2 +- ...paredStatementExecuteQueryInterceptor.java | 2 +- .../StatementExecuteQueryInterceptor.java | 2 +- .../StatementExecuteUpdateInterceptor.java | 4 +- .../interceptor/TransactionInterceptor.java | 15 +-- .../modifier/db/util/DatabaseInfo.java | 95 +++++++++---------- .../modifier/db/util/JDBCUrlParser.java | 6 +- .../StandardHostValveInvokeInterceptor.java | 3 +- .../java/com/profiler/context/TraceTest.java | 6 +- .../modifier/db/util/JDBCUrlParserTest.java | 8 +- 17 files changed, 90 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java index 6ae78f4cc..7d61fde57 100644 --- a/src/main/java/com/profiler/context/Span.java +++ b/src/main/java/com/profiler/context/Span.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.profiler.Agent; +import com.profiler.common.ServiceType; /** * Span represent RPC @@ -17,6 +18,7 @@ public class Span implements Thriftable { private long endTime; private String serviceName; private String rpc; + private ServiceType serviceType; private String endPoint; private boolean isTerminal = false; @@ -86,6 +88,14 @@ public class Span implements Thriftable { return endTime; } + public ServiceType getServiceType() { + return serviceType; + } + + public void setServiceType(ServiceType serviceType) { + this.serviceType = serviceType; + } + public String toString() { StringBuilder sb = new StringBuilder(); @@ -95,6 +105,7 @@ public class Span implements Thriftable { sb.append(", EndTime = ").append(endTime); sb.append(",\n\t Name = ").append(rpc); sb.append(", ServiceName = ").append(serviceName); + sb.append(", ServiceType = ").append(serviceType); sb.append(", EndPoint = ").append(endPoint); sb.append(",\n\t Annotations = {"); @@ -118,6 +129,7 @@ public class Span implements Thriftable { span.setLeastTraceId(traceID.getId().getLeastSignificantBits()); span.setRpc(rpc); span.setServiceName(serviceName); + span.setServiceType(serviceType.getCode()); span.setSpanId(traceID.getSpanId()); span.setParentSpanId(traceID.getParentSpanId()); span.setEndPoint(endPoint); diff --git a/src/main/java/com/profiler/context/Trace.java b/src/main/java/com/profiler/context/Trace.java index 2b305e255..fc194ff56 100644 --- a/src/main/java/com/profiler/context/Trace.java +++ b/src/main/java/com/profiler/context/Trace.java @@ -3,6 +3,7 @@ package com.profiler.context; import java.util.logging.Level; import java.util.logging.Logger; +import com.profiler.common.ServiceType; import com.profiler.interceptor.MethodDescriptor; import com.profiler.sender.DataSender; import com.profiler.sender.LoggingDataSender; @@ -268,13 +269,14 @@ public final class Trace { annotate(message); } - public void recordRpcName(final String service, final String rpc) { + public void recordRpcName(final ServiceType serviceType, final String serviceName, final String rpc) { if (!tracingEnabled) return; try { Span span = getCurrentStackFrame().getSpan(); - span.setServiceName(service); + span.setServiceType(serviceType); + span.setServiceName(serviceName); span.setRpc(rpc); } catch (Exception e) { logger.log(Level.SEVERE, e.getMessage(), e); diff --git a/src/main/java/com/profiler/modifier/arcus/interceptors/AddOpInterceptor.java b/src/main/java/com/profiler/modifier/arcus/interceptors/AddOpInterceptor.java index f8fb56621..f3b4803b0 100644 --- a/src/main/java/com/profiler/modifier/arcus/interceptors/AddOpInterceptor.java +++ b/src/main/java/com/profiler/modifier/arcus/interceptors/AddOpInterceptor.java @@ -39,10 +39,6 @@ public class AddOpInterceptor implements StaticBeforeInterceptor { serviceCode = MEMCACHED; } - if (serviceCode != null && !MEMCACHED.equals(serviceCode)) { - serviceCode = "ARCUS/" + serviceCode; - } - setServiceCode.invoke(op, serviceCode); System.out.println("[HIPPO-ADD_OP_FUNC] INJECT SERVICE_CODE INTO OP=" + serviceCode); diff --git a/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java b/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java index 1f2f381c9..6dc8060be 100644 --- a/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/bloc/handler/interceptors/ExecuteMethodInterceptor.java @@ -7,6 +7,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.profiler.Agent; +import com.profiler.common.ServiceType; import com.profiler.context.Header; import com.profiler.context.SpanID; import com.profiler.context.Trace; @@ -63,7 +64,7 @@ public class ExecuteMethodInterceptor implements StaticAroundInterceptor, ByteCo } trace.markBeforeTime(); - trace.recordRpcName("BLOC/" + Agent.getInstance().getApplicationName(), requestURL); + trace.recordRpcName(ServiceType.BLOC, Agent.getInstance().getApplicationName(), requestURL); trace.recordEndPoint(request.protocol().toString() + ":" + request.serverName().toString() + ":" + request.getServerPort()); trace.recordAttribute("http.url", request.requestURI().toString()); if (parameters != null && parameters.length() > 0) { diff --git a/src/main/java/com/profiler/modifier/connector/interceptors/Execute2MethodInterceptor.java b/src/main/java/com/profiler/modifier/connector/interceptors/Execute2MethodInterceptor.java index e2947bc1c..b11b9d88a 100644 --- a/src/main/java/com/profiler/modifier/connector/interceptors/Execute2MethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/connector/interceptors/Execute2MethodInterceptor.java @@ -8,6 +8,7 @@ import org.apache.http.HttpHost; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.utils.URIUtils; +import com.profiler.common.ServiceType; import com.profiler.context.Header; import com.profiler.context.Trace; import com.profiler.context.TraceContext; @@ -57,7 +58,7 @@ public class Execute2MethodInterceptor implements StaticAroundInterceptor, ByteC HttpHost host = URIUtils.extractHost(request.getURI()); - trace.recordRpcName(request.getProtocolVersion().toString(), "CLIENT"); + trace.recordRpcName(ServiceType.HTTP_CLIENT, request.getProtocolVersion().toString(), "CLIENT"); trace.recordEndPoint(request.getProtocolVersion().toString() + ":" + host.getHostName() + ":" + host.getPort()); trace.recordAttribute("http.url", request.getRequestLine().getUri()); } diff --git a/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java b/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java index 7a34958d1..cb58ead96 100644 --- a/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java +++ b/src/main/java/com/profiler/modifier/connector/interceptors/ExecuteMethodInterceptor.java @@ -1,5 +1,6 @@ package com.profiler.modifier.connector.interceptors; +import com.profiler.common.ServiceType; import com.profiler.context.*; import com.profiler.interceptor.ByteCodeMethodDescriptorSupport; import com.profiler.interceptor.MethodDescriptor; @@ -54,12 +55,9 @@ public class ExecuteMethodInterceptor implements StaticAroundInterceptor, ByteCo request.addHeader(Header.HTTP_SAMPLED.toString(), String.valueOf(nextId.isSampled())); request.addHeader(Header.HTTP_FLAGS.toString(), String.valueOf(nextId.getFlags())); - - trace.recordRpcName(request.getProtocolVersion().toString(), "CLIENT"); + trace.recordRpcName(ServiceType.HTTP_CLIENT, request.getProtocolVersion().toString(), "CLIENT"); trace.recordEndPoint(request.getProtocolVersion().toString() + ":" + host.getHostName() + ":" + host.getPort()); trace.recordAttribute("http.url", request.getRequestLine().getUri()); - - } @Override diff --git a/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java index 68d912c94..ba2724ddf 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/DriverConnectInterceptor.java @@ -71,7 +71,7 @@ public class DriverConnectInterceptor implements StaticAroundInterceptor, ByteCo if (trace == null) { return; } - trace.recordRpcName(databaseInfo.getType() + "/" + databaseInfo.getDatabaseId(), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); trace.recordApi(descriptor, new Object[]{args[0]}); diff --git a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java index bb863a638..b3915894f 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementCreateInterceptor.java @@ -45,7 +45,7 @@ public class PreparedStatementCreateInterceptor implements StaticAroundIntercept trace.markBeforeTime(); DatabaseInfo databaseInfo = (DatabaseInfo) getUrl.invoke(target); - trace.recordRpcName(databaseInfo.getType() + "/" + databaseInfo.getDatabaseId(), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); } diff --git a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java index 32557531f..7fe05ffb0 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/PreparedStatementExecuteQueryInterceptor.java @@ -48,7 +48,7 @@ public class PreparedStatementExecuteQueryInterceptor implements StaticAroundInt trace.markBeforeTime(); try { DatabaseInfo databaseInfo = (DatabaseInfo) getUrl.invoke(target); - trace.recordRpcName(databaseInfo.getType() + "/" + databaseInfo.getDatabaseId(), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); String sql = getSql.invoke(target); trace.recordAttribute("PreparedStatement", sql); diff --git a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java index 29e2da23b..1a7ebed0f 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteQueryInterceptor.java @@ -47,7 +47,7 @@ public class StatementExecuteQueryInterceptor implements StaticAroundInterceptor * If method was not called by request handler, we skip tagging. */ DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); - trace.recordRpcName(databaseInfo.getType() + "/" + databaseInfo.getDatabaseId(), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); // if (args.length > 0) { // trace.recordAttribute("Statement", args[0]); diff --git a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java index c9fc1a79e..61c4a92a4 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/StatementExecuteUpdateInterceptor.java @@ -44,12 +44,12 @@ public class StatementExecuteUpdateInterceptor implements StaticAroundIntercepto try { if (args.length > 0) { DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); - trace.recordRpcName(databaseInfo.getType() + "/" + databaseInfo.getDatabaseId(), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); trace.recordAttribute("Query", args[0]); } else { DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); - trace.recordRpcName(databaseInfo.getType() + "/" + databaseInfo.getDatabaseId(), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); trace.recordAttribute("Query", "args size is 0"); } diff --git a/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java b/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java index 694a52ffd..33b10d960 100644 --- a/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java +++ b/src/main/java/com/profiler/modifier/db/interceptor/TransactionInterceptor.java @@ -73,19 +73,14 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode } private void beforeStartTransaction(Trace trace, Connection target) { - trace.traceBlockBegin(); trace.markBeforeTime(); DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); - trace.recordRpcName(getRpcName(databaseInfo), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); } - private String getRpcName(DatabaseInfo databaseInfo) { - return databaseInfo.getType() + "/" + databaseInfo.getDatabaseId(); - } - private void afterStartTransaction(Trace trace, Connection target, Object[] arg, Object result) { try { trace.recordApi(descriptor, arg); @@ -128,7 +123,7 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode trace.markBeforeTime(); DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); - trace.recordRpcName(getRpcName(databaseInfo), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); // trace.record(Annotation.ClientSend); @@ -137,7 +132,7 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode private void afterCommit(Trace trace, Connection target, Object result) { try { DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); - trace.recordRpcName(getRpcName(databaseInfo), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); trace.recordApi(descriptor); @@ -168,7 +163,7 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode trace.markBeforeTime(); DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); - trace.recordRpcName(getRpcName(databaseInfo), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); } @@ -176,7 +171,7 @@ public class TransactionInterceptor implements StaticAroundInterceptor, ByteCode try { DatabaseInfo databaseInfo = (DatabaseInfo) this.getUrl.invoke(target); - trace.recordRpcName(getRpcName(databaseInfo), databaseInfo.getUrl()); + trace.recordRpcName(databaseInfo.getType(), databaseInfo.getDatabaseId(), databaseInfo.getUrl()); trace.recordTerminalEndPoint(databaseInfo.getUrl()); trace.recordApi(descriptor); diff --git a/src/main/java/com/profiler/modifier/db/util/DatabaseInfo.java b/src/main/java/com/profiler/modifier/db/util/DatabaseInfo.java index f4eea9ecc..f520050f1 100644 --- a/src/main/java/com/profiler/modifier/db/util/DatabaseInfo.java +++ b/src/main/java/com/profiler/modifier/db/util/DatabaseInfo.java @@ -1,68 +1,59 @@ package com.profiler.modifier.db.util; +import com.profiler.common.ServiceType; + /** * */ public class DatabaseInfo { - public enum DBType { - ORACLE, MYSQL, MSSQL, CUBRID, UNKOWN - } - DBType type = DBType.UNKOWN; - String databaseId; - // 입력된 url을 보정하지 않은 값 - String realUrl; - String normalizedUrl; - String host; - String port; + ServiceType type = ServiceType.UNKNOWN; + String databaseId; + // 입력된 url을 보정하지 않은 값 + String realUrl; + String normalizedUrl; + String host; + String port; + public DatabaseInfo(ServiceType type, String realUrl, String normalizedUrl, String host, String port, String databaseId) { + this.type = type; + this.realUrl = realUrl; + this.normalizedUrl = normalizedUrl; + this.host = host; + this.port = port; + this.databaseId = databaseId; + } - public DatabaseInfo(DBType type, String realUrl, String normalizedUrl, String host, String port, String databaseId) { - this.type = type; - this.realUrl = realUrl; - this.normalizedUrl = normalizedUrl; - this.host = host; - this.port = port; - this.databaseId = databaseId; - } + @Deprecated + public String getHost() { + // host와 port의 경우 replication 설정등으로 n개가 될수 있어 애매하다. + return host; + } - @Deprecated - public String getHost() { - // host와 port의 경우 replication 설정등으로 n개가 될수 있어 애매하다. - return host; - } + @Deprecated + public String getPort() { + // host와 port의 경우 replication 설정등으로 n개가 될수 있어 애매하다. + return port; + } - @Deprecated - public String getPort() { - // host와 port의 경우 replication 설정등으로 n개가 될수 있어 애매하다. - return port; - } + public String getDatabaseId() { + return databaseId; + } - public String getDatabaseId() { - return databaseId; - } + public String getRealUrl() { + return realUrl; + } - public String getRealUrl() { - return realUrl; - } + public String getUrl() { + return normalizedUrl; + } - public String getUrl() { - return normalizedUrl; - } + public ServiceType getType() { + return type; + } - public DBType getType() { - return type; - } - - @Override - public String toString() { - return "DatabaseInfo{" + - "type=" + type + - ", databaseId='" + databaseId + '\'' + - ", realUrl='" + realUrl + '\'' + - ", normalizedUrl='" + normalizedUrl + '\'' + - ", host='" + host + '\'' + - ", port='" + port + '\'' + - '}'; - } + @Override + public String toString() { + return "DatabaseInfo{" + "type=" + type + ", databaseId='" + databaseId + '\'' + ", realUrl='" + realUrl + '\'' + ", normalizedUrl='" + normalizedUrl + '\'' + ", host='" + host + '\'' + ", port='" + port + '\'' + '}'; + } } diff --git a/src/main/java/com/profiler/modifier/db/util/JDBCUrlParser.java b/src/main/java/com/profiler/modifier/db/util/JDBCUrlParser.java index e54649d83..74b83395d 100644 --- a/src/main/java/com/profiler/modifier/db/util/JDBCUrlParser.java +++ b/src/main/java/com/profiler/modifier/db/util/JDBCUrlParser.java @@ -1,6 +1,6 @@ package com.profiler.modifier.db.util; -import java.util.regex.Matcher; +import com.profiler.common.ServiceType; /** * @@ -15,7 +15,7 @@ public class JDBCUrlParser { return parseOracle(url); } - return new DatabaseInfo(DatabaseInfo.DBType.UNKOWN, url, url, "error", "error", "error"); + return new DatabaseInfo(ServiceType.UNKNOWN, url, url, "error", "error", "error"); // else if (url.indexOf("jdbc:oracle") >= 0) { // maker.lower().after("jdbc:oracle:").after(':'); // info.type = TYPE.ORACLE; @@ -76,6 +76,6 @@ public class JDBCUrlParser { String port = maker.next().after(':').before('/').value(); String databaseId = maker.next().afterLast('/').before('?').value(); String normalizedUrl = maker.clear().before('?').value(); - return new DatabaseInfo(DatabaseInfo.DBType.MYSQL, url, normalizedUrl, host, port, databaseId); + return new DatabaseInfo(ServiceType.MYSQL, url, normalizedUrl, host, port, databaseId); } } diff --git a/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java b/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java index 274770dad..2cb5055a4 100644 --- a/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java +++ b/src/main/java/com/profiler/modifier/tomcat/interceptors/StandardHostValveInvokeInterceptor.java @@ -9,6 +9,7 @@ import java.util.logging.Logger; import javax.servlet.http.HttpServletRequest; import com.profiler.Agent; +import com.profiler.common.ServiceType; import com.profiler.context.Header; import com.profiler.context.SpanID; import com.profiler.context.Trace; @@ -60,7 +61,7 @@ public class StandardHostValveInvokeInterceptor implements StaticAroundIntercept } trace.markBeforeTime(); - trace.recordRpcName("TOMCAT/" + Agent.getInstance().getApplicationName(), requestURL); + trace.recordRpcName(ServiceType.TOMCAT, Agent.getInstance().getApplicationName(), requestURL); trace.recordEndPoint(request.getProtocol() + ":" + request.getServerName() + ":" + request.getServerPort()); trace.recordAttribute("http.url", request.getRequestURI()); if (parameters != null && parameters.length() > 0) { diff --git a/src/test/java/com/profiler/context/TraceTest.java b/src/test/java/com/profiler/context/TraceTest.java index e23ec1696..18ae67401 100644 --- a/src/test/java/com/profiler/context/TraceTest.java +++ b/src/test/java/com/profiler/context/TraceTest.java @@ -2,6 +2,8 @@ package com.profiler.context; import org.junit.Test; +import com.profiler.common.ServiceType; + public class TraceTest { @Test @@ -11,7 +13,7 @@ public class TraceTest { trace.traceBlockBegin(); // http server receive - trace.recordRpcName("service_name", "http://"); + trace.recordRpcName(ServiceType.UNKNOWN, "service_name", "http://"); trace.recordEndPoint("http:localhost:8080"); trace.recordAttribute("KEY", "VALUE"); trace.record(Annotation.ServerRecv); @@ -30,7 +32,7 @@ public class TraceTest { trace.record(Annotation.ClientSend); // db server request - trace.recordRpcName("mysql", "rpc"); + trace.recordRpcName(ServiceType.MYSQL, "mysql", "rpc"); trace.recordAttribute("mysql.query", "SELECT * FROM TABLE"); // get a db response diff --git a/src/test/java/com/profiler/modifier/db/util/JDBCUrlParserTest.java b/src/test/java/com/profiler/modifier/db/util/JDBCUrlParserTest.java index 5e920a248..5bcd3930f 100644 --- a/src/test/java/com/profiler/modifier/db/util/JDBCUrlParserTest.java +++ b/src/test/java/com/profiler/modifier/db/util/JDBCUrlParserTest.java @@ -5,6 +5,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.profiler.common.ServiceType; + import java.net.URI; /** @@ -40,7 +42,7 @@ public class JDBCUrlParserTest { public void mysqlParse1() { DatabaseInfo dbInfo = JDBCUrlParser.parse("jdbc:mysql://ip_address:3306/database_name?useUnicode=yes&characterEncoding=UTF-8"); - Assert.assertEquals(dbInfo.getType(), DatabaseInfo.DBType.MYSQL); + Assert.assertEquals(dbInfo.getType(), ServiceType.MYSQL); Assert.assertEquals(dbInfo.getHost(), "ip_address"); Assert.assertEquals(dbInfo.getPort(), "3306"); Assert.assertEquals(dbInfo.getDatabaseId(), "database_name"); @@ -51,7 +53,7 @@ public class JDBCUrlParserTest { public void mysqlParse2() { DatabaseInfo dbInfo = JDBCUrlParser.parse("jdbc:mysql://10.98.133.22:3306/test_lucy_db"); - Assert.assertEquals(dbInfo.getType(), DatabaseInfo.DBType.MYSQL); + Assert.assertEquals(dbInfo.getType(), ServiceType.MYSQL); Assert.assertEquals(dbInfo.getHost(), "10.98.133.22"); Assert.assertEquals(dbInfo.getPort(), "3306"); Assert.assertEquals(dbInfo.getDatabaseId(), "test_lucy_db"); @@ -61,7 +63,7 @@ public class JDBCUrlParserTest { @Test public void mysqlParse3() { DatabaseInfo dbInfo = JDBCUrlParser.parse("jdbc:mysql://61.74.71.31/log?useUnicode=yes&characterEncoding=UTF-8"); - Assert.assertEquals(dbInfo.getType(), DatabaseInfo.DBType.MYSQL); + Assert.assertEquals(dbInfo.getType(), ServiceType.MYSQL); Assert.assertEquals(dbInfo.getHost(), "61.74.71.31"); Assert.assertEquals(dbInfo.getPort(), ""); Assert.assertEquals(dbInfo.getDatabaseId(), "log");