diff --git a/scouter.agent.java/src/scouter/agent/counter/meter/MeterService.java b/scouter.agent.java/src/scouter/agent/counter/meter/MeterService.java index a92144fb9..d90236e92 100644 --- a/scouter.agent.java/src/scouter/agent/counter/meter/MeterService.java +++ b/scouter.agent.java/src/scouter/agent/counter/meter/MeterService.java @@ -28,10 +28,16 @@ public static MeterService getInstance() { return inst; } - static class Bucket { + final static int PCT_MAX_TIME = 10000; + final static int PCT_UNIT_TIME = 200; + final static int PCT_BUCKET = PCT_MAX_TIME / PCT_UNIT_TIME; + + final static class Bucket { + final short[] pct90 = new short[PCT_BUCKET]; int count; - int error; long time; + + int error; } private MeteringUtil meter = new MeteringUtil() { @@ -43,15 +49,24 @@ protected void clear(Bucket o) { o.count = 0; o.error = 0; o.time = 0L; + for (int i = 0; i < PCT_BUCKET; i++) { + o.pct90[i] = 0; + } } }; - public synchronized void add(long elapsed, boolean err) { + public synchronized void add(int elapsed, boolean err) { Bucket b = meter.getCurrentBucket(); b.count++; b.time += elapsed; - if (err) + if (err) { b.error++; + } + if (elapsed < PCT_MAX_TIME) { + int x = (int) (elapsed / PCT_UNIT_TIME); + b.pct90[x]++; + } + } public float getTPS(int period) { @@ -77,6 +92,31 @@ public void process(Bucket b) { return (int) ((cnt.value == 0) ? 0 : sum.value / cnt.value); } + public int getElapsed90Pct(int period) { + final LONG sum = new LONG(); + final INT cnt = new INT(); + meter.search(period, new Handler() { + public void process(Bucket b) { + int total = (int) (b.count * 0.9); + if (total == 0) + return; + + for (int timeInx = 0; timeInx < PCT_BUCKET; timeInx++) { + if (total >= b.pct90[timeInx]) { + total -= b.pct90[timeInx]; + } else { + sum.value += timeInx * PCT_UNIT_TIME; + cnt.value++; + return; + } + } + sum.value += PCT_MAX_TIME; + cnt.value++; + } + }); + return (int) ((cnt.value == 0) ? 0 : sum.value / cnt.value); + } + public float getError(int period) { final INT cnt = new INT(); diff --git a/scouter.agent.java/src/scouter/agent/counter/task/ServicePerf.java b/scouter.agent.java/src/scouter/agent/counter/task/ServicePerf.java index 44539f4a1..bb3009934 100644 --- a/scouter.agent.java/src/scouter/agent/counter/task/ServicePerf.java +++ b/scouter.agent.java/src/scouter/agent/counter/task/ServicePerf.java @@ -38,28 +38,29 @@ public class ServicePerf { public void getServicePerf(CounterBasket pw) { Configure conf = Configure.getInstance(); MeterService service = MeterService.getInstance(); - float elapsed = service.getElapsedTime(30); + int elapsed = service.getElapsedTime(30); float tps = service.getTPS(30); float err = service.getError(30); int count = service.getServiceCount(60); - + int resp90pct = service.getElapsed90Pct(30); + int[] act = TraceContextManager.getActiveCount(); int active = act[0] + act[1] + act[2]; if (conf.auto_dump_trigger <= active) { DumpUtil.autoDump(); - } - + } activeCounter.add(active); // active service 30초 평균으로 변경 active = (int) Math.round(activeCounter.getAvg(30)); PerfCounterPack p = pw.getPack(TimeTypeEnum.REALTIME); - p.put(CounterConstants.WAS_ELAPSED_TIME, new FloatValue(elapsed)); + p.put(CounterConstants.WAS_ELAPSED_TIME, new DecimalValue(elapsed)); p.put(CounterConstants.WAS_SERVICE_COUNT, new DecimalValue(count)); p.put(CounterConstants.WAS_TPS, new FloatValue(tps)); p.put(CounterConstants.WAS_ERROR_RATE, new FloatValue(err)); - p.put(CounterConstants.WAS_ACTIVE_SERVICE, new DecimalValue(active)); + p.put(CounterConstants.WAS_ACTIVE_SERVICE, new DecimalValue(active)); + p.put(CounterConstants.WAS_ELAPSED_90PCT, new DecimalValue(resp90pct)); ListValue activeSpeed = new ListValue(); activeSpeed.add(act[0]); @@ -75,13 +76,15 @@ public void getServicePerf(CounterBasket pw) { elapsed = service.getElapsedTime(300); err = service.getError(300); int activeSErvice = (int) activeCounter.getAvg(300); - + resp90pct = service.getElapsed90Pct(300); + p = pw.getPack(TimeTypeEnum.FIVE_MIN); - p.put(CounterConstants.WAS_ELAPSED_TIME, new FloatValue(elapsed)); + p.put(CounterConstants.WAS_ELAPSED_TIME, new DecimalValue(elapsed)); p.put(CounterConstants.WAS_SERVICE_COUNT, new DecimalValue(count)); p.put(CounterConstants.WAS_TPS, new FloatValue(tps)); p.put(CounterConstants.WAS_ERROR_RATE, new FloatValue(err)); - p.put(CounterConstants.WAS_ACTIVE_SERVICE, new DecimalValue(activeSErvice)); + p.put(CounterConstants.WAS_ACTIVE_SERVICE, new DecimalValue(activeSErvice)); + p.put(CounterConstants.WAS_ELAPSED_90PCT, new DecimalValue(resp90pct)); } } \ No newline at end of file diff --git a/scouter.agent.java/src/scouter/agent/netio/data/DataProxy.java b/scouter.agent.java/src/scouter/agent/netio/data/DataProxy.java index 0b5c18206..f3c45b9ea 100644 --- a/scouter.agent.java/src/scouter/agent/netio/data/DataProxy.java +++ b/scouter.agent.java/src/scouter/agent/netio/data/DataProxy.java @@ -14,8 +14,8 @@ * limitations under the License. */ -package scouter.agent.netio.data; - +package scouter.agent.netio.data; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -36,184 +36,204 @@ import scouter.lang.step.Step; import scouter.lang.value.MapValue; import scouter.util.IntLinkedSet; - -public class DataProxy { - private static UDPDataSendThread udpCollect = UDPDataSendThread.getInstance(); - - private static IntLinkedSet sqlText = new IntLinkedSet().setMax(10000); - - public static void sendSqlText(int hash, String sql) { - if (sqlText.contains(hash)) { - return; - } - sqlText.put(hash); - // udp.add(new TextPack(TextTypes.SQL, hash, sql)); - sendDirect(new TextPack(TextTypes.SQL, hash, sql)); - } - - private static IntLinkedSet serviceName = new IntLinkedSet().setMax(10000); - - public static void sendServiceName(int hash, String service) { - if (serviceName.contains(hash)) { - return; - } - serviceName.put(hash); - udpCollect.add(new TextPack(TextTypes.SERVICE, hash, service)); - } - - private static IntLinkedSet referer = new IntLinkedSet().setMax(1000); - - public static void sendReferer(int hash, String text) { - if (referer.contains(hash)) { - return; - } - referer.put(hash); - sendDirect(new TextPack(TextTypes.REFERER, hash, text)); - } - - private static IntLinkedSet userAgent = new IntLinkedSet().setMax(1000); - - public static void sendUserAgent(int hash, String text) { - if (userAgent.contains(hash)) { - return; - } - userAgent.put(hash); - udpCollect.add(new TextPack(TextTypes.USER_AGENT, hash, text)); - } - - private static IntLinkedSet methodName = new IntLinkedSet().setMax(10000); - - public static void sendMethodName(int hash, String name) { - if (methodName.contains(hash)) { - return; - } - methodName.put(hash); - - udpCollect.add(new TextPack(TextTypes.METHOD, hash, name)); - } - - private static IntLinkedSet subcall = new IntLinkedSet().setMax(10000); - - public static void sendApicall(int hash, String name) { - if (subcall.contains(hash)) { - return; - } - subcall.put(hash); - udpCollect.add(new TextPack(TextTypes.APICALL, hash, name)); - } - - static Configure conf = Configure.getInstance(); - - public static void sendAlert(byte level, String title, String message, MapValue tags) { - AlertPack p = new AlertPack(); - p.objType = conf.scouter_type; - p.objHash = conf.objHash; - p.level = level; - p.title = title; - p.message = message; - if (tags != null) { - p.tags = tags; - } - - sendDirect(p); - } - - private static IntLinkedSet errText = new IntLinkedSet().setMax(10000); - - public static void sendError(int hash, String message) { - if (errText.contains(hash)) { - return; - } - errText.put(hash); - udpCollect.add(new TextPack(TextTypes.ERROR, hash, message)); - } - - public static void reset() { - serviceName.clear(); - errText.clear(); - subcall.clear(); - methodName.clear(); - sqlText.clear(); - } - - public static void sendXLog(XLogPack p) { - p.objHash = conf.objHash; - sendDirect(p); - if (conf.debug_udp_xlog) { - Logger.info(p.toString()); - } - } - - static DataUdpAgent udpNet = DataUdpAgent.getInstance(); - - private static void sendDirect(Pack p) { - try { - udpNet.write(new DataOutputX().writePack(p).toByteArray()); - } catch (IOException e) { - } - } - - private static void sendDirect(List buff) { - switch (buff.size()) { - case 1: - udpNet.write(buff.get(0)); - break; - default: - udpNet.write(buff); - break; - } - } - - static DataUdpAgent udpDirect = DataUdpAgent.getInstance(); - - public static void sendProfile(Step[] p, TraceContext x) { - if (p == null || p.length == 0) - return; - XLogProfilePack pk = new XLogProfilePack(); - pk.txid = x.txid; - pk.objHash = conf.objHash; - pk.profile = Step.toBytes(p); - pk.service=x.serviceHash; - pk.elapsed=(int)(System.currentTimeMillis()-x.startTime); - sendDirect(pk); - } - - public static void sendProfile(List p, TraceContext x) { - if (p == null || p.size() == 0) - return; - XLogProfilePack pk = new XLogProfilePack(); - pk.txid = x.txid; - pk.objHash = conf.objHash; - pk.profile = Step.toBytes(p); - // udp.add(pk); - sendDirect(pk); - } - - public static void sendCounter(PerfCounterPack[] p) { - // udp.add(p); - try { - List buff = new ArrayList(); - int bytes = 0; - for (int k = 0; k < p.length; k++) { - byte[] b = new DataOutputX().writePack(p[k]).toByteArray(); - if (bytes + b.length >= conf.udp_packet_max) { - sendDirect(buff); // buff.size가 0일수도 있다. - bytes = 0;// bytes 값 초기화.. - buff.clear(); - } - bytes += b.length; - buff.add(b); - } - sendDirect(buff); - } catch (Exception e) { - } - } - - public static void sendHeartBeat(ObjectPack p) { - udpCollect.add(p); - if (conf.debug_udp_object) { - Logger.info(p.toString()); - } - } - + +public class DataProxy { + private static UDPDataSendThread udpCollect = UDPDataSendThread.getInstance(); + + private static IntLinkedSet sqlText = new IntLinkedSet().setMax(10000); + + public static void sendSqlText(int hash, String sql) { + if (sqlText.contains(hash)) { + return; + } + sqlText.put(hash); + // udp.add(new TextPack(TextTypes.SQL, hash, sql)); + sendDirect(new TextPack(TextTypes.SQL, hash, sql)); + } + + private static IntLinkedSet serviceName = new IntLinkedSet().setMax(10000); + + public static void sendServiceName(int hash, String service) { + if (serviceName.contains(hash)) { + return; + } + serviceName.put(hash); + udpCollect.add(new TextPack(TextTypes.SERVICE, hash, service)); + } + + private static IntLinkedSet referer = new IntLinkedSet().setMax(1000); + + public static void sendReferer(int hash, String text) { + if (referer.contains(hash)) { + return; + } + referer.put(hash); + sendDirect(new TextPack(TextTypes.REFERER, hash, text)); + } + + private static IntLinkedSet userAgent = new IntLinkedSet().setMax(1000); + + public static void sendUserAgent(int hash, String text) { + if (userAgent.contains(hash)) { + return; + } + userAgent.put(hash); + udpCollect.add(new TextPack(TextTypes.USER_AGENT, hash, text)); + } + + private static IntLinkedSet methodName = new IntLinkedSet().setMax(10000); + + public static void sendMethodName(int hash, String name) { + if (methodName.contains(hash)) { + return; + } + methodName.put(hash); + + udpCollect.add(new TextPack(TextTypes.METHOD, hash, name)); + } + + private static IntLinkedSet apicall = new IntLinkedSet().setMax(10000); + + public static void sendApicall(int hash, String name) { + if (apicall.contains(hash)) { + return; + } + apicall.put(hash); + udpCollect.add(new TextPack(TextTypes.APICALL, hash, name)); + } + + static Configure conf = Configure.getInstance(); + + public static void sendAlert(byte level, String title, String message, MapValue tags) { + AlertPack p = new AlertPack(); + p.objType = conf.scouter_type; + p.objHash = conf.objHash; + p.level = level; + p.title = title; + p.message = message; + if (tags != null) { + p.tags = tags; + } + + sendDirect(p); + } + + private static IntLinkedSet errText = new IntLinkedSet().setMax(10000); + + public static void sendError(int hash, String message) { + if (errText.contains(hash)) { + return; + } + errText.put(hash); + udpCollect.add(new TextPack(TextTypes.ERROR, hash, message)); + } + + private static IntLinkedSet bizTable = new IntLinkedSet().setMax(1000); + + public static void sendBizCode(int hash, String bizcode) { + if (bizTable.contains(hash)) { + return; + } + bizTable.put(hash); + udpCollect.add(new TextPack(TextTypes.BIZCODE, hash, bizcode)); + } + + private static IntLinkedSet loginTable = new IntLinkedSet().setMax(10000); + + public static void sendLogin(int login, String loginName) { + if (loginTable.contains(login)) { + return; + } + loginTable.put(login); + udpCollect.add(new TextPack(TextTypes.LOGIN, login, loginName)); + } + + public static void reset() { + serviceName.clear(); + errText.clear(); + apicall.clear(); + methodName.clear(); + sqlText.clear(); + } + + public static void sendXLog(XLogPack p) { + p.objHash = conf.objHash; + sendDirect(p); + if (conf.debug_udp_xlog) { + Logger.info(p.toString()); + } + } + + static DataUdpAgent udpNet = DataUdpAgent.getInstance(); + + private static void sendDirect(Pack p) { + try { + udpNet.write(new DataOutputX().writePack(p).toByteArray()); + } catch (IOException e) { + } + } + + private static void sendDirect(List buff) { + switch (buff.size()) { + case 1: + udpNet.write(buff.get(0)); + break; + default: + udpNet.write(buff); + break; + } + } + + static DataUdpAgent udpDirect = DataUdpAgent.getInstance(); + + public static void sendProfile(Step[] p, TraceContext x) { + if (p == null || p.length == 0) + return; + XLogProfilePack pk = new XLogProfilePack(); + pk.txid = x.txid; + pk.objHash = conf.objHash; + pk.profile = Step.toBytes(p); + pk.service = x.serviceHash; + pk.elapsed = (int) (System.currentTimeMillis() - x.startTime); + sendDirect(pk); + } + + public static void sendProfile(List p, TraceContext x) { + if (p == null || p.size() == 0) + return; + XLogProfilePack pk = new XLogProfilePack(); + pk.txid = x.txid; + pk.objHash = conf.objHash; + pk.profile = Step.toBytes(p); + // udp.add(pk); + sendDirect(pk); + } + + public static void sendCounter(PerfCounterPack[] p) { + // udp.add(p); + try { + List buff = new ArrayList(); + int bytes = 0; + for (int k = 0; k < p.length; k++) { + byte[] b = new DataOutputX().writePack(p[k]).toByteArray(); + if (bytes + b.length >= conf.udp_packet_max) { + sendDirect(buff); // buff.size가 0일수도 있다. + bytes = 0;// bytes 값 초기화.. + buff.clear(); + } + bytes += b.length; + buff.add(b); + } + sendDirect(buff); + } catch (Exception e) { + } + } + + public static void sendHeartBeat(ObjectPack p) { + udpCollect.add(p); + if (conf.debug_udp_object) { + Logger.info(p.toString()); + } + } + } \ No newline at end of file diff --git a/scouter.agent.java/src/scouter/agent/netio/request/handle/AgentThread.java b/scouter.agent.java/src/scouter/agent/netio/request/handle/AgentThread.java index f8eb08929..8671ca73a 100644 --- a/scouter.agent.java/src/scouter/agent/netio/request/handle/AgentThread.java +++ b/scouter.agent.java/src/scouter/agent/netio/request/handle/AgentThread.java @@ -142,7 +142,11 @@ public Pack activeThreadList(Pack param) { ListValue sql = rPack.newList("sql"); ListValue subcall = rPack.newList("subcall"); - + + ListValue login = rPack.newList("login"); + ListValue biz = rPack.newList("biz"); + + Enumeration en = TraceContextManager.getContextEnumeration(); while (en.hasMoreElements()) { TraceContext ctx = en.nextElement(); @@ -161,7 +165,9 @@ public Pack activeThreadList(Pack param) { } catch (Throwable th) { Logger.println("A128", th); cpu.add(0L); - } + } + login.add(ctx.login); + biz.add(ctx.bizcode); } rPack.put("complete", new BooleanValue(true)); return rPack; diff --git a/scouter.agent.java/src/scouter/agent/trace/TraceContext.java b/scouter.agent.java/src/scouter/agent/trace/TraceContext.java index cb37d7755..2ec0f59ea 100644 --- a/scouter.agent.java/src/scouter/agent/trace/TraceContext.java +++ b/scouter.agent.java/src/scouter/agent/trace/TraceContext.java @@ -83,6 +83,9 @@ public TraceContext(boolean profile_summary) { public boolean is_child_tx; public long caller; public long callee; + + public String login; + public String bizcode; diff --git a/scouter.agent.java/src/scouter/agent/trace/TraceMain.java b/scouter.agent.java/src/scouter/agent/trace/TraceMain.java index 802306b3c..0666770c8 100644 --- a/scouter.agent.java/src/scouter/agent/trace/TraceMain.java +++ b/scouter.agent.java/src/scouter/agent/trace/TraceMain.java @@ -30,6 +30,7 @@ import scouter.lang.step.MessageStep; import scouter.lang.step.MethodStep; import scouter.util.ArrayUtil; +import scouter.util.HashUtil; import scouter.util.IPUtil; import scouter.util.KeyGen; import scouter.util.ObjectUtil; @@ -294,6 +295,15 @@ public static void endHttpService(Object stat, Throwable thr) { pack.apicallCount = ctx.apicall_count; pack.apicallTime = ctx.apicall_time; pack.caller = ctx.caller; + + if(ctx.login!=null){ + pack.login = HashUtil.hash(ctx.login); + DataProxy.sendLogin(pack.login, ctx.login); + } + if(ctx.bizcode!=null){ + pack.biz = HashUtil.hash(ctx.bizcode); + DataProxy.sendBizCode(pack.biz, ctx.bizcode); + } metering(pack); HttpServiceTracePlugIn.end(ctx, pack); if (sendOk) { @@ -385,8 +395,6 @@ public static void endService(Object stat, Object returnValue, Throwable thr) { } else if (thr != null) { Configure conf = Configure.getInstance(); String emsg = thr.toString(); - // AlertProxy.sendAlert(AlertLevel.ERROR, "SERVICE_EXCEPTION", - // emsg); if (conf.profile_fullstack_service_error) { StringBuffer sb = new StringBuffer(); sb.append(emsg).append("\n"); @@ -406,7 +414,16 @@ public static void endService(Object stat, Object returnValue, Throwable thr) { // 2015.02.02 pack.apicallCount = ctx.apicall_count; pack.apicallTime = ctx.apicall_time; - // pack.divPerf = o.divPerf; + + if(ctx.login!=null){ + pack.login = HashUtil.hash(ctx.login); + DataProxy.sendLogin(pack.login, ctx.login); + } + if(ctx.bizcode!=null){ + pack.biz = HashUtil.hash(ctx.bizcode); + DataProxy.sendBizCode(pack.biz, ctx.bizcode); + } + ServiceTracePlugIn.end(ctx, pack); metering(pack); if (sendOk) { diff --git a/scouter.agent.java/src/scouter/agent/trace/TraceSQL.java b/scouter.agent.java/src/scouter/agent/trace/TraceSQL.java index 1c9e7f03d..ce14e619a 100644 --- a/scouter.agent.java/src/scouter/agent/trace/TraceSQL.java +++ b/scouter.agent.java/src/scouter/agent/trace/TraceSQL.java @@ -195,7 +195,9 @@ private static String escapeLiteral(String sql, SqlStep step) { if (parsed.hashCode() == sqlHash) { noLiteralSql.put(sqlHash); } else { - checkedSql.put(sqlHash, new ParsedSql(parsed, els.getParameter())); + psql=new ParsedSql(parsed, els.getParameter()); + checkedSql.put(sqlHash, psql); + step.param = psql.param; } return parsed; } diff --git a/scouter.client/src/scouter/client/stack/actions/MainFrameAction.java b/scouter.client/src/scouter/client/stack/actions/MainFrameAction.java index 47e3c5186..12d9e89dd 100644 --- a/scouter.client/src/scouter/client/stack/actions/MainFrameAction.java +++ b/scouter.client/src/scouter/client/stack/actions/MainFrameAction.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.actions; diff --git a/scouter.client/src/scouter/client/stack/base/AnalyzedTableModel.java b/scouter.client/src/scouter/client/stack/base/AnalyzedTableModel.java index d4284e1b9..f2d70ebf2 100644 --- a/scouter.client/src/scouter/client/stack/base/AnalyzedTableModel.java +++ b/scouter.client/src/scouter/client/stack/base/AnalyzedTableModel.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/FilterInputDialog.java b/scouter.client/src/scouter/client/stack/base/FilterInputDialog.java index d7b006cb1..6b095c8c2 100644 --- a/scouter.client/src/scouter/client/stack/base/FilterInputDialog.java +++ b/scouter.client/src/scouter/client/stack/base/FilterInputDialog.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/HelpWindow.java b/scouter.client/src/scouter/client/stack/base/HelpWindow.java index 3775f138d..f9eea60a9 100644 --- a/scouter.client/src/scouter/client/stack/base/HelpWindow.java +++ b/scouter.client/src/scouter/client/stack/base/HelpWindow.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/MainFrame.java b/scouter.client/src/scouter/client/stack/base/MainFrame.java index d4ad315a1..797fa1b59 100644 --- a/scouter.client/src/scouter/client/stack/base/MainFrame.java +++ b/scouter.client/src/scouter/client/stack/base/MainFrame.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/MainTreeRenderer.java b/scouter.client/src/scouter/client/stack/base/MainTreeRenderer.java index b016145e9..eed0cdde4 100644 --- a/scouter.client/src/scouter/client/stack/base/MainTreeRenderer.java +++ b/scouter.client/src/scouter/client/stack/base/MainTreeRenderer.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/PerformanceTreeRenderer.java b/scouter.client/src/scouter/client/stack/base/PerformanceTreeRenderer.java index 609277e79..7781d4cbb 100644 --- a/scouter.client/src/scouter/client/stack/base/PerformanceTreeRenderer.java +++ b/scouter.client/src/scouter/client/stack/base/PerformanceTreeRenderer.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/PerformanceWindow.java b/scouter.client/src/scouter/client/stack/base/PerformanceWindow.java index 6d142db3c..3c18d982e 100644 --- a/scouter.client/src/scouter/client/stack/base/PerformanceWindow.java +++ b/scouter.client/src/scouter/client/stack/base/PerformanceWindow.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ diff --git a/scouter.client/src/scouter/client/stack/base/PopupListener.java b/scouter.client/src/scouter/client/stack/base/PopupListener.java index bf7b5c1a3..1d67f7c46 100644 --- a/scouter.client/src/scouter/client/stack/base/PopupListener.java +++ b/scouter.client/src/scouter/client/stack/base/PopupListener.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/PreferenceManager.java b/scouter.client/src/scouter/client/stack/base/PreferenceManager.java index d3608852c..cd4b0cf89 100644 --- a/scouter.client/src/scouter/client/stack/base/PreferenceManager.java +++ b/scouter.client/src/scouter/client/stack/base/PreferenceManager.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/ProgressBarWindow.java b/scouter.client/src/scouter/client/stack/base/ProgressBarWindow.java index f77ee2ab1..3817ed529 100644 --- a/scouter.client/src/scouter/client/stack/base/ProgressBarWindow.java +++ b/scouter.client/src/scouter/client/stack/base/ProgressBarWindow.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/SelectFileFilter.java b/scouter.client/src/scouter/client/stack/base/SelectFileFilter.java index efe880a68..fbf06bc02 100644 --- a/scouter.client/src/scouter/client/stack/base/SelectFileFilter.java +++ b/scouter.client/src/scouter/client/stack/base/SelectFileFilter.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/StackFileFilter.java b/scouter.client/src/scouter/client/stack/base/StackFileFilter.java index e328df808..1a6295b68 100644 --- a/scouter.client/src/scouter/client/stack/base/StackFileFilter.java +++ b/scouter.client/src/scouter/client/stack/base/StackFileFilter.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/ViewScrollPane.java b/scouter.client/src/scouter/client/stack/base/ViewScrollPane.java index a6357979e..e4af8e46d 100644 --- a/scouter.client/src/scouter/client/stack/base/ViewScrollPane.java +++ b/scouter.client/src/scouter/client/stack/base/ViewScrollPane.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/base/WindowObject.java b/scouter.client/src/scouter/client/stack/base/WindowObject.java index ece076d39..cffe7237a 100644 --- a/scouter.client/src/scouter/client/stack/base/WindowObject.java +++ b/scouter.client/src/scouter/client/stack/base/WindowObject.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.base; diff --git a/scouter.client/src/scouter/client/stack/config/AnalyzerValue.java b/scouter.client/src/scouter/client/stack/config/AnalyzerValue.java index 590bf540f..33bef7fc7 100644 --- a/scouter.client/src/scouter/client/stack/config/AnalyzerValue.java +++ b/scouter.client/src/scouter/client/stack/config/AnalyzerValue.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config; diff --git a/scouter.client/src/scouter/client/stack/config/JmxConfig.java b/scouter.client/src/scouter/client/stack/config/JmxConfig.java index 92af317ad..9e45054d9 100644 --- a/scouter.client/src/scouter/client/stack/config/JmxConfig.java +++ b/scouter.client/src/scouter/client/stack/config/JmxConfig.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config; diff --git a/scouter.client/src/scouter/client/stack/config/JmxServerValue.java b/scouter.client/src/scouter/client/stack/config/JmxServerValue.java index 46f65235e..7c80ca555 100644 --- a/scouter.client/src/scouter/client/stack/config/JmxServerValue.java +++ b/scouter.client/src/scouter/client/stack/config/JmxServerValue.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config; diff --git a/scouter.client/src/scouter/client/stack/config/ParserConfig.java b/scouter.client/src/scouter/client/stack/config/ParserConfig.java index fc13238af..120ccc551 100644 --- a/scouter.client/src/scouter/client/stack/config/ParserConfig.java +++ b/scouter.client/src/scouter/client/stack/config/ParserConfig.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config; diff --git a/scouter.client/src/scouter/client/stack/config/ParserConfigReader.java b/scouter.client/src/scouter/client/stack/config/ParserConfigReader.java index c855ccfed..297f415d4 100644 --- a/scouter.client/src/scouter/client/stack/config/ParserConfigReader.java +++ b/scouter.client/src/scouter/client/stack/config/ParserConfigReader.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config; diff --git a/scouter.client/src/scouter/client/stack/config/XMLReader.java b/scouter.client/src/scouter/client/stack/config/XMLReader.java index d18f0c60b..3a0762868 100644 --- a/scouter.client/src/scouter/client/stack/config/XMLReader.java +++ b/scouter.client/src/scouter/client/stack/config/XMLReader.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ParserPreProcessorReader.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ParserPreProcessorReader.java index a568f2b73..616beb3d5 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ParserPreProcessorReader.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ParserPreProcessorReader.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/PreProcessor.java b/scouter.client/src/scouter/client/stack/config/preprocessor/PreProcessor.java index 6b0211af6..bef4910d9 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/PreProcessor.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/PreProcessor.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/Processor.java b/scouter.client/src/scouter/client/stack/config/preprocessor/Processor.java index d9e7db308..83c66cda7 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/Processor.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/Processor.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorAdd.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorAdd.java index 81fb97ab7..068d2e366 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorAdd.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorAdd.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveCount.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveCount.java index 42e42a4d4..ca80f21fa 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveCount.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveCount.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveFrom.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveFrom.java index 77eb8a79b..a6994f6f4 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveFrom.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveFrom.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveLine.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveLine.java index 30329d8c3..f266c2114 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveLine.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveLine.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveStart.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveStart.java index c57979b81..1720f1d88 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveStart.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveStart.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveValue.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveValue.java index bf4fec5bc..b2cea0686 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveValue.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorRemoveValue.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorReplace.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorReplace.java index 8a4315819..30a25b10a 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorReplace.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorReplace.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorReplaceStart.java b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorReplaceStart.java index 1276cd271..bc1e4aa3c 100644 --- a/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorReplaceStart.java +++ b/scouter.client/src/scouter/client/stack/config/preprocessor/ProcessorReplaceStart.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.config.preprocessor; diff --git a/scouter.client/src/scouter/client/stack/data/AbstractInfo.java b/scouter.client/src/scouter/client/stack/data/AbstractInfo.java index bba7f4de9..abdfa1d9d 100644 --- a/scouter.client/src/scouter/client/stack/data/AbstractInfo.java +++ b/scouter.client/src/scouter/client/stack/data/AbstractInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/AnalyzedFileFilter.java b/scouter.client/src/scouter/client/stack/data/AnalyzedFileFilter.java index 9ef631195..2d0424584 100644 --- a/scouter.client/src/scouter/client/stack/data/AnalyzedFileFilter.java +++ b/scouter.client/src/scouter/client/stack/data/AnalyzedFileFilter.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/BasicFileStackParser.java b/scouter.client/src/scouter/client/stack/data/BasicFileStackParser.java index 23b984d22..4f6131462 100644 --- a/scouter.client/src/scouter/client/stack/data/BasicFileStackParser.java +++ b/scouter.client/src/scouter/client/stack/data/BasicFileStackParser.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/DevonFileStackParser.java b/scouter.client/src/scouter/client/stack/data/DevonFileStackParser.java index 642b790d3..714ffca38 100644 --- a/scouter.client/src/scouter/client/stack/data/DevonFileStackParser.java +++ b/scouter.client/src/scouter/client/stack/data/DevonFileStackParser.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/FilterExcludeStackParser.java b/scouter.client/src/scouter/client/stack/data/FilterExcludeStackParser.java index 925c87355..d2bbe8b2f 100644 --- a/scouter.client/src/scouter/client/stack/data/FilterExcludeStackParser.java +++ b/scouter.client/src/scouter/client/stack/data/FilterExcludeStackParser.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/FilterStackParser.java b/scouter.client/src/scouter/client/stack/data/FilterStackParser.java index fdb4610e3..47846fb5e 100644 --- a/scouter.client/src/scouter/client/stack/data/FilterStackParser.java +++ b/scouter.client/src/scouter/client/stack/data/FilterStackParser.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/StackAnalyzedInfo.java b/scouter.client/src/scouter/client/stack/data/StackAnalyzedInfo.java index c2eea5d7d..c8b547021 100644 --- a/scouter.client/src/scouter/client/stack/data/StackAnalyzedInfo.java +++ b/scouter.client/src/scouter/client/stack/data/StackAnalyzedInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/StackAnalyzedValue.java b/scouter.client/src/scouter/client/stack/data/StackAnalyzedValue.java index cbdcb8fba..dae6f84a6 100644 --- a/scouter.client/src/scouter/client/stack/data/StackAnalyzedValue.java +++ b/scouter.client/src/scouter/client/stack/data/StackAnalyzedValue.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/StackAnalyzedValueComp.java b/scouter.client/src/scouter/client/stack/data/StackAnalyzedValueComp.java index 4c46e5283..b5baa0050 100644 --- a/scouter.client/src/scouter/client/stack/data/StackAnalyzedValueComp.java +++ b/scouter.client/src/scouter/client/stack/data/StackAnalyzedValueComp.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/StackFileInfo.java b/scouter.client/src/scouter/client/stack/data/StackFileInfo.java index f1f24bd65..71a9dedbd 100644 --- a/scouter.client/src/scouter/client/stack/data/StackFileInfo.java +++ b/scouter.client/src/scouter/client/stack/data/StackFileInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/StackParser.java b/scouter.client/src/scouter/client/stack/data/StackParser.java index 000f74d1a..f43a700b8 100644 --- a/scouter.client/src/scouter/client/stack/data/StackParser.java +++ b/scouter.client/src/scouter/client/stack/data/StackParser.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/data/ThreadStatusInfo.java b/scouter.client/src/scouter/client/stack/data/ThreadStatusInfo.java index 15217819f..59830614e 100644 --- a/scouter.client/src/scouter/client/stack/data/ThreadStatusInfo.java +++ b/scouter.client/src/scouter/client/stack/data/ThreadStatusInfo.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.data; diff --git a/scouter.client/src/scouter/client/stack/doc/SDPA-help.html b/scouter.client/src/scouter/client/stack/doc/SDPA-help.html index 311ef62a2..873f982b3 100644 --- a/scouter.client/src/scouter/client/stack/doc/SDPA-help.html +++ b/scouter.client/src/scouter/client/stack/doc/SDPA-help.html @@ -1,8 +1,6 @@ Stack Performance Analyzer

- - Date: 2015.8.8 (Version 1.0) - + Date: 2015.8.8 (Version 1.0) \ No newline at end of file diff --git a/scouter.client/src/scouter/client/stack/doc/welcome.html b/scouter.client/src/scouter/client/stack/doc/welcome.html index b2c4ae27e..461049e5f 100644 --- a/scouter.client/src/scouter/client/stack/doc/welcome.html +++ b/scouter.client/src/scouter/client/stack/doc/welcome.html @@ -6,8 +6,7 @@
-
-
+
diff --git a/scouter.client/src/scouter/client/stack/utils/HtmlUtils.java b/scouter.client/src/scouter/client/stack/utils/HtmlUtils.java index 155f03668..bc144ab0d 100644 --- a/scouter.client/src/scouter/client/stack/utils/HtmlUtils.java +++ b/scouter.client/src/scouter/client/stack/utils/HtmlUtils.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.utils; diff --git a/scouter.client/src/scouter/client/stack/utils/NumberUtils.java b/scouter.client/src/scouter/client/stack/utils/NumberUtils.java index f303802f6..6c3df2a00 100644 --- a/scouter.client/src/scouter/client/stack/utils/NumberUtils.java +++ b/scouter.client/src/scouter/client/stack/utils/NumberUtils.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.utils; diff --git a/scouter.client/src/scouter/client/stack/utils/ResourceUtils.java b/scouter.client/src/scouter/client/stack/utils/ResourceUtils.java index 4369b4439..07f7a9d72 100644 --- a/scouter.client/src/scouter/client/stack/utils/ResourceUtils.java +++ b/scouter.client/src/scouter/client/stack/utils/ResourceUtils.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.utils; diff --git a/scouter.client/src/scouter/client/stack/utils/StringUtils.java b/scouter.client/src/scouter/client/stack/utils/StringUtils.java index 6d34f1618..9b7f20fa4 100644 --- a/scouter.client/src/scouter/client/stack/utils/StringUtils.java +++ b/scouter.client/src/scouter/client/stack/utils/StringUtils.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.utils; diff --git a/scouter.client/src/scouter/client/stack/utils/ValueObject.java b/scouter.client/src/scouter/client/stack/utils/ValueObject.java index d2e693539..64a12fbac 100644 --- a/scouter.client/src/scouter/client/stack/utils/ValueObject.java +++ b/scouter.client/src/scouter/client/stack/utils/ValueObject.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.utils; diff --git a/scouter.client/src/scouter/client/stack/utils/ValueObjectComp.java b/scouter.client/src/scouter/client/stack/utils/ValueObjectComp.java index 18995cbbc..f80db4593 100644 --- a/scouter.client/src/scouter/client/stack/utils/ValueObjectComp.java +++ b/scouter.client/src/scouter/client/stack/utils/ValueObjectComp.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.utils; diff --git a/scouter.client/src/scouter/client/stack/views/StackAnalyzerView.java b/scouter.client/src/scouter/client/stack/views/StackAnalyzerView.java index 275fdd7c9..ef7c2ee4d 100644 --- a/scouter.client/src/scouter/client/stack/views/StackAnalyzerView.java +++ b/scouter.client/src/scouter/client/stack/views/StackAnalyzerView.java @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License. * */ package scouter.client.stack.views; @@ -28,6 +28,7 @@ import scouter.client.stack.actions.MainFrameAction; import scouter.client.stack.base.MainFrame; import scouter.client.util.ImageUtil; +import scouter.util.SystemUtil; public class StackAnalyzerView extends ViewPart { @@ -54,6 +55,9 @@ public void run() { }); Composite swtAwtComponent = new Composite(parent, SWT.EMBEDDED); + if (SystemUtil.IS_MAC_OSX) { + SWT_AWT.embeddedFrameClass = "sun.lwawt.macosx.CViewEmbeddedFrame"; + } java.awt.Frame baseFrame = SWT_AWT.new_Frame( swtAwtComponent ); MainFrame frame = MainFrame.instance(true); frame.init(); diff --git a/scouter.client/src/scouter/client/util/CounterUtil.java b/scouter.client/src/scouter/client/util/CounterUtil.java index 72824de08..2973e0daf 100644 --- a/scouter.client/src/scouter/client/util/CounterUtil.java +++ b/scouter.client/src/scouter/client/util/CounterUtil.java @@ -42,6 +42,7 @@ public static boolean isPercentValue(String objType, String counter) { static { counterAvgSet.add(CounterConstants.WAS_ERROR_RATE); counterAvgSet.add(CounterConstants.WAS_ELAPSED_TIME); + counterAvgSet.add(CounterConstants.WAS_ELAPSED_90PCT); } public static String getTotalMode(String objType, String counter) { diff --git a/scouter.common/src/scouter/lang/TextTypes.java b/scouter.common/src/scouter/lang/TextTypes.java index d1f5b44d2..b3163ef6d 100644 --- a/scouter.common/src/scouter/lang/TextTypes.java +++ b/scouter.common/src/scouter/lang/TextTypes.java @@ -30,5 +30,7 @@ public interface TextTypes{ public static String CITY = "city"; public static String SQL_TABLES = "table"; public static String MARIA = "maria"; + public static String LOGIN = "login"; + public static String BIZCODE = "biz"; } \ No newline at end of file diff --git a/scouter.common/src/scouter/lang/counters/CounterConstants.java b/scouter.common/src/scouter/lang/counters/CounterConstants.java index 7e8271c9e..28f0b798a 100644 --- a/scouter.common/src/scouter/lang/counters/CounterConstants.java +++ b/scouter.common/src/scouter/lang/counters/CounterConstants.java @@ -48,6 +48,7 @@ public class CounterConstants { public final static String WAS_TPS = "TPS"; public final static String WAS_ACTIVE_SPEED = "ActiveSpeed"; public final static String WAS_ELAPSED_TIME = "ElapsedTime"; + public final static String WAS_ELAPSED_90PCT = "Elapsed90%"; public final static String WAS_SERVICE_COUNT = "ServiceCount"; public final static String WAS_ERROR_RATE = "ErrorRate"; public final static String WAS_ACTIVE_SERVICE = "ActiveService"; diff --git a/scouter.common/src/scouter/lang/counters/counters.xml b/scouter.common/src/scouter/lang/counters/counters.xml index ab4842017..9a624e36a 100644 --- a/scouter.common/src/scouter/lang/counters/counters.xml +++ b/scouter.common/src/scouter/lang/counters/counters.xml @@ -49,6 +49,7 @@ tagcnt : TagCount + diff --git a/scouter.common/src/scouter/lang/pack/XLogPack.java b/scouter.common/src/scouter/lang/pack/XLogPack.java index ce129cf79..d8771ac57 100644 --- a/scouter.common/src/scouter/lang/pack/XLogPack.java +++ b/scouter.common/src/scouter/lang/pack/XLogPack.java @@ -52,7 +52,10 @@ public class XLogPack implements Pack { public int city; public byte xType; //see XLogTypes - public String toString() { + public int login; + public int biz; + + public String toString() { StringBuilder sb = new StringBuilder(); sb.append("XLOG "); sb.append(DateUtil.timestamp(endTime)); @@ -98,6 +101,9 @@ public void write(DataOutputX out) throws IOException { o.writeDecimal(city); o.writeDecimal(xType); + o.writeDecimal(login); + o.writeDecimal(biz); + out.writeBlob(o.toByteArray()); } @@ -132,6 +138,10 @@ public Pack read(DataInputX din) throws IOException { if (d.available() > 0) { this.xType=d.readByte(); } + if (d.available() > 0) { + this.login=(int)d.readDecimal(); + this.biz=(int)d.readDecimal(); + } return this; } diff --git a/scouter.deploy/build.xml b/scouter.deploy/build.xml index 725fb9e77..98d543156 100644 --- a/scouter.deploy/build.xml +++ b/scouter.deploy/build.xml @@ -4,7 +4,7 @@ - + diff --git a/scouter.server/src/scouter/server/db/TextPermWR.scala b/scouter.server/src/scouter/server/db/TextPermWR.scala index e8304b794..62eac779f 100644 --- a/scouter.server/src/scouter/server/db/TextPermWR.scala +++ b/scouter.server/src/scouter/server/db/TextPermWR.scala @@ -43,7 +43,12 @@ object TextPermWR { val common = new IntSet(); common.add(HashUtil.hash(TextTypes.METHOD)); common.add(HashUtil.hash(TextTypes.GROUP)); - common.add(HashUtil.hash(TextTypes.CITY)); + common.add(HashUtil.hash(TextTypes.CITY)); + //move to perm db + common.add(HashUtil.hash(TextTypes.LOGIN)); + common.add(HashUtil.hash(TextTypes.BIZCODE)); + common.add(HashUtil.hash(TextTypes.GROUP)); + common.add(HashUtil.hash(TextTypes.USER_AGENT)); def isA(divs: Int): Boolean = { return common.contains(divs);
Open