More restructuring for remote collection

glowroot · Oct 10, 2015 · 2215870 · 2215870
1 parent 65f96ca
commit 2215870
Show file tree

Hide file tree

Showing 875 changed files with 9,824 additions and 8,650 deletions.
diff --git a/api/.gitignore → agent/api/.gitignore b/api/.gitignore → agent/api/.gitignore
diff --git a/api/pom.xml → agent/api/pom.xml b/api/pom.xml → agent/api/pom.xml
@@ -7,12 +7,13 @@
     <groupId>org.glowroot</groupId>
     <artifactId>glowroot-parent</artifactId>
     <version>0.8.5-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
-  <artifactId>glowroot-api</artifactId>
+  <artifactId>glowroot-agent-api</artifactId>
 
-  <name>Glowroot API</name>
-  <description>Glowroot API</description>
+  <name>Glowroot Agent API</name>
+  <description>Glowroot Agent API</description>
 
   <dependencies>
     <dependency>
@@ -35,7 +36,7 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <configuration>
             <excludePackageNames>
-              org.glowroot.api.internal
+              org.glowroot.agent.api.internal
             </excludePackageNames>
           </configuration>
         </plugin>

diff --git a/.../main/java/org/glowroot/api/Glowroot.java → ...java/org/glowroot/agent/api/Glowroot.java b/.../main/java/org/glowroot/api/Glowroot.java → ...java/org/glowroot/agent/api/Glowroot.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.api;
+package org.glowroot.agent.api;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.TimeUnit;
@@ -23,8 +23,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.glowroot.api.internal.GlowrootService;
-import org.glowroot.api.internal.NopGlowrootService;
+import org.glowroot.agent.api.internal.GlowrootService;
+import org.glowroot.agent.api.internal.NopGlowrootService;
 
 public class Glowroot {
 
@@ -35,7 +35,8 @@ public class Glowroot {
     static {
         GlowrootService service;
         try {
-            Class<?> registryClass = Class.forName("org.glowroot.agent.impl.ServiceRegistryImpl");
+            Class<?> registryClass =
+                    Class.forName("org.glowroot.agent.core.impl.ServiceRegistryImpl");
             Method getInstanceMethod = registryClass.getMethod("getGlowrootService");
             service = (GlowrootService) getInstanceMethod.invoke(null);
             if (service == null) {

diff --git a/agent/api/src/main/java/org/glowroot/agent/api/Instrument.java b/agent/api/src/main/java/org/glowroot/agent/api/Instrument.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * 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.
+ */
+package org.glowroot.agent.api;
+
+public @interface Instrument {
+
+    public @interface Timer {
+        String value(); // the timer name
+    }
+
+    public @interface TraceEntry {
+        String messageTemplate();
+        String timerName();
+    }
+
+    public @interface Transaction {
+        String transactionType();
+        String transactionNameTemplate();
+        String timerName();
+    }
+}
diff --git a/...lowroot/api/internal/GlowrootService.java → ...t/agent/api/internal/GlowrootService.java b/...lowroot/api/internal/GlowrootService.java → ...t/agent/api/internal/GlowrootService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.api.internal;
+package org.glowroot.agent.api.internal;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/...root/api/internal/NopGlowrootService.java → ...gent/api/internal/NopGlowrootService.java b/...root/api/internal/NopGlowrootService.java → ...gent/api/internal/NopGlowrootService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.api.internal;
+package org.glowroot.agent.api.internal;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/collector-spi/.gitignore → agent/benchmarks/.gitignore b/collector-spi/.gitignore → agent/benchmarks/.gitignore
diff --git a/testing/microbenchmarks/pom.xml → agent/benchmarks/pom.xml b/testing/microbenchmarks/pom.xml → agent/benchmarks/pom.xml
@@ -10,15 +10,15 @@
     <relativePath>../..</relativePath>
   </parent>
 
-  <artifactId>glowroot-microbenchmarks</artifactId>
+  <artifactId>glowroot-agent-benchmarks</artifactId>
 
-  <name>Glowroot Microbenchmarks</name>
-  <description>Glowroot Microbenchmarks</description>
+  <name>Glowroot Agent Benchmarks</name>
+  <description>Glowroot Agent Benchmarks</description>
 
   <dependencies>
     <dependency>
       <groupId>org.glowroot</groupId>
-      <artifactId>glowroot-plugin-api</artifactId>
+      <artifactId>glowroot-agent-plugin-api</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -27,17 +27,15 @@
       <artifactId>guava</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>4.2.1.RELEASE</version>
-    </dependency>
-    <dependency>
-      <!-- optional dependency of spring-web, included since it would typically be present along
-        with spring-web, and allows more of the spring-web types to be resolved -->
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <version>3.1.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>4.2.1.RELEASE</version>
+    </dependency>
     <dependency>
       <groupId>org.openjdk.jmh</groupId>
       <artifactId>jmh-core</artifactId>
@@ -47,6 +45,11 @@
       <artifactId>jmh-generator-annprocess</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/...wroot/plugin/jdbc/ResultSetBenchmark.java → ...agent/plugin/jdbc/ResultSetBenchmark.java b/...wroot/plugin/jdbc/ResultSetBenchmark.java → ...agent/plugin/jdbc/ResultSetBenchmark.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.plugin.jdbc;
+package org.glowroot.agent.plugin.jdbc;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -34,13 +34,13 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
-import org.glowroot.plugin.api.Agent;
-import org.glowroot.plugin.api.transaction.MessageSupplier;
-import org.glowroot.plugin.api.transaction.TimerName;
-import org.glowroot.plugin.api.transaction.TraceEntry;
-import org.glowroot.plugin.api.transaction.TransactionService;
-import org.glowroot.plugin.api.weaving.Pointcut;
-import org.glowroot.plugin.jdbc.support.MockConnection;
+import org.glowroot.agent.plugin.api.Agent;
+import org.glowroot.agent.plugin.api.transaction.MessageSupplier;
+import org.glowroot.agent.plugin.api.transaction.TimerName;
+import org.glowroot.agent.plugin.api.transaction.TraceEntry;
+import org.glowroot.agent.plugin.api.transaction.TransactionService;
+import org.glowroot.agent.plugin.api.weaving.Pointcut;
+import org.glowroot.agent.plugin.jdbc.support.MockConnection;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)

diff --git a/...t/plugin/jdbc/support/MockConnection.java → ...t/plugin/jdbc/support/MockConnection.java b/...t/plugin/jdbc/support/MockConnection.java → ...t/plugin/jdbc/support/MockConnection.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.plugin.jdbc.support;
+package org.glowroot.agent.plugin.jdbc.support;
 
 import java.sql.Array;
 import java.sql.Blob;

diff --git a/...n/jdbc/support/MockPreparedStatement.java → ...n/jdbc/support/MockPreparedStatement.java b/...n/jdbc/support/MockPreparedStatement.java → ...n/jdbc/support/MockPreparedStatement.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.plugin.jdbc.support;
+package org.glowroot.agent.plugin.jdbc.support;
 
 import java.io.InputStream;
 import java.io.Reader;

diff --git a/...ot/plugin/jdbc/support/MockResultSet.java → ...nt/plugin/jdbc/support/MockResultSet.java b/...ot/plugin/jdbc/support/MockResultSet.java → ...nt/plugin/jdbc/support/MockResultSet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.plugin.jdbc.support;
+package org.glowroot.agent.plugin.jdbc.support;
 
 import java.io.InputStream;
 import java.io.Reader;

diff --git a/...root/plugin/servlet/ServletBenchmark.java → ...gent/plugin/servlet/ServletBenchmark.java b/...root/plugin/servlet/ServletBenchmark.java → ...gent/plugin/servlet/ServletBenchmark.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.plugin.servlet;
+package org.glowroot.agent.plugin.servlet;
 
 import java.util.concurrent.TimeUnit;
 
@@ -29,9 +29,9 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 
-import org.glowroot.plugin.servlet.support.MockHttpRequest;
-import org.glowroot.plugin.servlet.support.MockHttpResponse;
-import org.glowroot.plugin.servlet.support.MockHttpServlet;
+import org.glowroot.agent.plugin.servlet.support.MockHttpRequest;
+import org.glowroot.agent.plugin.servlet.support.MockHttpResponse;
+import org.glowroot.agent.plugin.servlet.support.MockHttpServlet;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.MICROSECONDS)

diff --git a/...ugin/servlet/support/MockHttpRequest.java → ...ugin/servlet/support/MockHttpRequest.java b/...ugin/servlet/support/MockHttpRequest.java → ...ugin/servlet/support/MockHttpRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.plugin.servlet.support;
+package org.glowroot.agent.plugin.servlet.support;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...gin/servlet/support/MockHttpResponse.java → ...gin/servlet/support/MockHttpResponse.java b/...gin/servlet/support/MockHttpResponse.java → ...gin/servlet/support/MockHttpResponse.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.plugin.servlet.support;
+package org.glowroot.agent.plugin.servlet.support;
 
 import java.io.IOException;
 import java.io.PrintWriter;

diff --git a/...ugin/servlet/support/MockHttpServlet.java → ...ugin/servlet/support/MockHttpServlet.java b/...ugin/servlet/support/MockHttpServlet.java → ...ugin/servlet/support/MockHttpServlet.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.glowroot.plugin.servlet.support;
+package org.glowroot.agent.plugin.servlet.support;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

diff --git a/...lowroot/microbenchmarks/PointcutType.java → ...lowroot/microbenchmarks/PointcutType.java b/...lowroot/microbenchmarks/PointcutType.java → ...lowroot/microbenchmarks/PointcutType.java
diff --git a/...wroot/microbenchmarks/TimerBenchmark.java → ...wroot/microbenchmarks/TimerBenchmark.java b/...wroot/microbenchmarks/TimerBenchmark.java → ...wroot/microbenchmarks/TimerBenchmark.java
@@ -27,13 +27,13 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
+import org.glowroot.agent.plugin.api.Agent;
+import org.glowroot.agent.plugin.api.transaction.MessageSupplier;
+import org.glowroot.agent.plugin.api.transaction.TimerName;
+import org.glowroot.agent.plugin.api.transaction.TraceEntry;
+import org.glowroot.agent.plugin.api.transaction.TransactionService;
+import org.glowroot.agent.plugin.api.weaving.Pointcut;
 import org.glowroot.microbenchmarks.support.TimerWorthy;
-import org.glowroot.plugin.api.Agent;
-import org.glowroot.plugin.api.transaction.MessageSupplier;
-import org.glowroot.plugin.api.transaction.TimerName;
-import org.glowroot.plugin.api.transaction.TraceEntry;
-import org.glowroot.plugin.api.transaction.TransactionService;
-import org.glowroot.plugin.api.weaving.Pointcut;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)

diff --git a/...robenchmarks/TimerWorstCaseBenchmark.java → ...robenchmarks/TimerWorstCaseBenchmark.java b/...robenchmarks/TimerWorstCaseBenchmark.java → ...robenchmarks/TimerWorstCaseBenchmark.java
@@ -27,13 +27,13 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
 
+import org.glowroot.agent.plugin.api.Agent;
+import org.glowroot.agent.plugin.api.transaction.MessageSupplier;
+import org.glowroot.agent.plugin.api.transaction.TimerName;
+import org.glowroot.agent.plugin.api.transaction.TraceEntry;
+import org.glowroot.agent.plugin.api.transaction.TransactionService;
+import org.glowroot.agent.plugin.api.weaving.Pointcut;
 import org.glowroot.microbenchmarks.support.TimerWorthy;
-import org.glowroot.plugin.api.Agent;
-import org.glowroot.plugin.api.transaction.MessageSupplier;
-import org.glowroot.plugin.api.transaction.TimerName;
-import org.glowroot.plugin.api.transaction.TraceEntry;
-import org.glowroot.plugin.api.transaction.TransactionService;
-import org.glowroot.plugin.api.weaving.Pointcut;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)

diff --git a/.../microbenchmarks/TraceEntryBenchmark.java → .../microbenchmarks/TraceEntryBenchmark.java b/.../microbenchmarks/TraceEntryBenchmark.java → .../microbenchmarks/TraceEntryBenchmark.java
@@ -27,13 +27,13 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 
+import org.glowroot.agent.plugin.api.Agent;
+import org.glowroot.agent.plugin.api.transaction.MessageSupplier;
+import org.glowroot.agent.plugin.api.transaction.TimerName;
+import org.glowroot.agent.plugin.api.transaction.TraceEntry;
+import org.glowroot.agent.plugin.api.transaction.TransactionService;
+import org.glowroot.agent.plugin.api.weaving.Pointcut;
 import org.glowroot.microbenchmarks.support.TraceEntryWorthy;
-import org.glowroot.plugin.api.Agent;
-import org.glowroot.plugin.api.transaction.MessageSupplier;
-import org.glowroot.plugin.api.transaction.TimerName;
-import org.glowroot.plugin.api.transaction.TraceEntry;
-import org.glowroot.plugin.api.transaction.TransactionService;
-import org.glowroot.plugin.api.weaving.Pointcut;
 
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)

diff --git a/...microbenchmarks/TransactionBenchmark.java → ...microbenchmarks/TransactionBenchmark.java b/...microbenchmarks/TransactionBenchmark.java → ...microbenchmarks/TransactionBenchmark.java
diff --git a/...oot/microbenchmarks/WeavingBenchmark.java → ...oot/microbenchmarks/WeavingBenchmark.java b/...oot/microbenchmarks/WeavingBenchmark.java → ...oot/microbenchmarks/WeavingBenchmark.java
diff --git a/.../microbenchmarks/support/TimerWorthy.java → .../microbenchmarks/support/TimerWorthy.java b/.../microbenchmarks/support/TimerWorthy.java → .../microbenchmarks/support/TimerWorthy.java
diff --git a/...benchmarks/support/TimerWorthyAspect.java → ...benchmarks/support/TimerWorthyAspect.java b/...benchmarks/support/TimerWorthyAspect.java → ...benchmarks/support/TimerWorthyAspect.java
@@ -15,16 +15,16 @@
  */
 package org.glowroot.microbenchmarks.support;
 
-import org.glowroot.plugin.api.Agent;
-import org.glowroot.plugin.api.config.ConfigService;
-import org.glowroot.plugin.api.transaction.Timer;
-import org.glowroot.plugin.api.transaction.TimerName;
-import org.glowroot.plugin.api.transaction.TransactionService;
-import org.glowroot.plugin.api.weaving.BindTraveler;
-import org.glowroot.plugin.api.weaving.IsEnabled;
-import org.glowroot.plugin.api.weaving.OnAfter;
-import org.glowroot.plugin.api.weaving.OnBefore;
-import org.glowroot.plugin.api.weaving.Pointcut;
+import org.glowroot.agent.plugin.api.Agent;
+import org.glowroot.agent.plugin.api.config.ConfigService;
+import org.glowroot.agent.plugin.api.transaction.Timer;
+import org.glowroot.agent.plugin.api.transaction.TimerName;
+import org.glowroot.agent.plugin.api.transaction.TransactionService;
+import org.glowroot.agent.plugin.api.weaving.BindTraveler;
+import org.glowroot.agent.plugin.api.weaving.IsEnabled;
+import org.glowroot.agent.plugin.api.weaving.OnAfter;
+import org.glowroot.agent.plugin.api.weaving.OnBefore;
+import org.glowroot.agent.plugin.api.weaving.Pointcut;
 
 public class TimerWorthyAspect {
 

diff --git a/...obenchmarks/support/TraceEntryWorthy.java → ...obenchmarks/support/TraceEntryWorthy.java b/...obenchmarks/support/TraceEntryWorthy.java → ...obenchmarks/support/TraceEntryWorthy.java
diff --git a/...marks/support/TraceEntryWorthyAspect.java → ...marks/support/TraceEntryWorthyAspect.java b/...marks/support/TraceEntryWorthyAspect.java → ...marks/support/TraceEntryWorthyAspect.java
@@ -15,19 +15,19 @@
  */
 package org.glowroot.microbenchmarks.support;
 
-import org.glowroot.plugin.api.Agent;
-import org.glowroot.plugin.api.config.ConfigService;
-import org.glowroot.plugin.api.transaction.MessageSupplier;
-import org.glowroot.plugin.api.transaction.TimerName;
-import org.glowroot.plugin.api.transaction.TraceEntry;
-import org.glowroot.plugin.api.transaction.TransactionService;
-import org.glowroot.plugin.api.weaving.BindThrowable;
-import org.glowroot.plugin.api.weaving.BindTraveler;
-import org.glowroot.plugin.api.weaving.IsEnabled;
-import org.glowroot.plugin.api.weaving.OnAfter;
-import org.glowroot.plugin.api.weaving.OnBefore;
-import org.glowroot.plugin.api.weaving.OnThrow;
-import org.glowroot.plugin.api.weaving.Pointcut;
+import org.glowroot.agent.plugin.api.Agent;
+import org.glowroot.agent.plugin.api.config.ConfigService;
+import org.glowroot.agent.plugin.api.transaction.MessageSupplier;
+import org.glowroot.agent.plugin.api.transaction.TimerName;
+import org.glowroot.agent.plugin.api.transaction.TraceEntry;
+import org.glowroot.agent.plugin.api.transaction.TransactionService;
+import org.glowroot.agent.plugin.api.weaving.BindThrowable;
+import org.glowroot.agent.plugin.api.weaving.BindTraveler;
+import org.glowroot.agent.plugin.api.weaving.IsEnabled;
+import org.glowroot.agent.plugin.api.weaving.OnAfter;
+import org.glowroot.agent.plugin.api.weaving.OnBefore;
+import org.glowroot.agent.plugin.api.weaving.OnThrow;
+import org.glowroot.agent.plugin.api.weaving.Pointcut;
 
 public class TraceEntryWorthyAspect {
 

diff --git a/...benchmarks/support/TransactionWorthy.java → ...benchmarks/support/TransactionWorthy.java b/...benchmarks/support/TransactionWorthy.java → ...benchmarks/support/TransactionWorthy.java