This is an automated email from the ASF dual-hosted git repository.
quantranhong1999 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new bd0988f495 Drop glowroot integration
bd0988f495 is described below
commit bd0988f49557600003ca5479310e2e310bdbc990
Author: Benoit TELLIER <[email protected]>
AuthorDate: Mon Sep 14 21:44:45 2026 +0200
Drop glowroot integration
- Pinned release is no longer downloadable.
- Integration do not make sense with a reactive stack
---
.gitignore | 1 -
.../servers/pages/distributed/pop3-only.adoc | 8 ----
.../servers/pages/distributed/run/k8s-values.adoc | 3 --
.../servers/pages/distributed/run/run-docker.adoc | 13 ------
docs/modules/servers/pages/jpa/run/run-docker.adoc | 8 ----
docs/modules/servers/pages/jpa/smtp-only.adoc | 8 ----
.../servers/pages/postgres/run/run-docker.adoc | 13 ------
pom.xml | 5 ---
server/apps/distributed-app/README.adoc | 11 -----
.../helm-chart/james/templates/_helpers.tpl | 4 --
.../helm-chart/james/values.schema.json | 11 +----
.../distributed-app/helm-chart/james/values.yaml | 2 -
server/apps/distributed-app/pom.xml | 49 ----------------------
.../distributed-app/src/main/glowroot/admin.json | 5 ---
.../src/main/glowroot/plugins/blobstore.json | 26 ------------
.../src/main/glowroot/plugins/imap.json | 19 ---------
.../src/main/glowroot/plugins/jmap.json | 19 ---------
.../src/main/glowroot/plugins/mailboxListener.json | 19 ---------
.../src/main/glowroot/plugins/pop3.json | 19 ---------
.../src/main/glowroot/plugins/smtp.json | 19 ---------
.../src/main/glowroot/plugins/spooler.json | 45 --------------------
.../src/main/glowroot/plugins/task.json | 19 ---------
server/apps/distributed-pop3-app/README.adoc | 7 ----
server/apps/distributed-pop3-app/pom.xml | 47 ---------------------
.../src/main/glowroot/admin.json | 5 ---
.../src/main/glowroot/plugins/blobstore.json | 26 ------------
.../src/main/glowroot/plugins/mailboxListener.json | 19 ---------
.../src/main/glowroot/plugins/pop3.json | 19 ---------
.../src/main/glowroot/plugins/smtp.json | 19 ---------
.../src/main/glowroot/plugins/spooler.json | 45 --------------------
.../src/main/glowroot/plugins/task.json | 19 ---------
server/apps/jpa-app/README.adoc | 9 ----
server/apps/jpa-app/pom.xml | 49 ----------------------
server/apps/jpa-app/src/main/glowroot/admin.json | 5 ---
.../jpa-app/src/main/glowroot/plugins/imap.json | 19 ---------
.../jpa-app/src/main/glowroot/plugins/jmap.json | 19 ---------
.../src/main/glowroot/plugins/mailboxListener.json | 19 ---------
.../jpa-app/src/main/glowroot/plugins/pop3.json | 19 ---------
.../jpa-app/src/main/glowroot/plugins/smtp.json | 19 ---------
.../jpa-app/src/main/glowroot/plugins/spooler.json | 45 --------------------
.../jpa-app/src/main/glowroot/plugins/task.json | 19 ---------
server/apps/jpa-smtp-app/README.adoc | 8 ----
server/apps/jpa-smtp-app/pom.xml | 49 ----------------------
.../apps/jpa-smtp-app/src/main/glowroot/admin.json | 5 ---
.../src/main/glowroot/plugins/imap.json | 19 ---------
.../src/main/glowroot/plugins/jmap.json | 19 ---------
.../src/main/glowroot/plugins/mailboxListener.json | 19 ---------
.../src/main/glowroot/plugins/pop3.json | 19 ---------
.../src/main/glowroot/plugins/smtp.json | 19 ---------
.../src/main/glowroot/plugins/spooler.json | 45 --------------------
.../src/main/glowroot/plugins/task.json | 19 ---------
server/apps/memory-app/README.md | 6 ---
server/apps/memory-app/pom.xml | 49 ----------------------
.../apps/memory-app/src/main/glowroot/admin.json | 5 ---
.../memory-app/src/main/glowroot/plugins/imap.json | 19 ---------
.../memory-app/src/main/glowroot/plugins/jmap.json | 19 ---------
.../src/main/glowroot/plugins/mailboxListener.json | 19 ---------
.../memory-app/src/main/glowroot/plugins/pop3.json | 19 ---------
.../memory-app/src/main/glowroot/plugins/smtp.json | 19 ---------
.../src/main/glowroot/plugins/spooler.json | 45 --------------------
.../memory-app/src/main/glowroot/plugins/task.json | 19 ---------
server/apps/postgres-app/pom.xml | 49 ----------------------
.../apps/postgres-app/src/main/glowroot/admin.json | 5 ---
.../src/main/glowroot/plugins/imap.json | 19 ---------
.../src/main/glowroot/plugins/jmap.json | 19 ---------
.../src/main/glowroot/plugins/mailboxListener.json | 19 ---------
.../src/main/glowroot/plugins/pop3.json | 19 ---------
.../src/main/glowroot/plugins/smtp.json | 19 ---------
.../src/main/glowroot/plugins/spooler.json | 45 --------------------
.../src/main/glowroot/plugins/task.json | 19 ---------
server/apps/scaling-pulsar-smtp/README.adoc | 7 ----
server/apps/scaling-pulsar-smtp/pom.xml | 47 ---------------------
.../scaling-pulsar-smtp/src/main/glowroot/.gitkeep | 0
server/container/guice/memory/README.md | 6 ---
74 files changed, 1 insertion(+), 1466 deletions(-)
diff --git a/.gitignore b/.gitignore
index 39fe4e8075..23f2304499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ dependency-reduced-pom.xml
dockerfiles/run/**/*.lib
dockerfiles/run/**/*.jar
dockerfiles/run/**/keystore
-dockerfiles/run/**/glowroot
.m2
test-run.log
build
diff --git a/docs/modules/servers/pages/distributed/pop3-only.adoc
b/docs/modules/servers/pages/distributed/pop3-only.adoc
index 5e590c81e5..03336124d7 100644
--- a/docs/modules/servers/pages/distributed/pop3-only.adoc
+++ b/docs/modules/servers/pages/distributed/pop3-only.adoc
@@ -149,14 +149,6 @@ $ docker run --network james --environment
DOMAIN=domain.tld \
-e "JAVA_TOOL_OPTIONS=-Xmx500m -Xms500m"
apache/james:distributed-pop3-latest
----
-link:https://glowroot.org/[Glowroot APM] is packaged within the image.
Disabled by default, its java agent can be
-enabled:
-
-[source,bash]
-----
-$ docker run --network james -e
"JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:distributed-pop3-latest
-----
-
The xref:distributed/operate/cli.adoc[CLI] is available within the container:
[source,bash]
diff --git a/docs/modules/servers/pages/distributed/run/k8s-values.adoc
b/docs/modules/servers/pages/distributed/run/k8s-values.adoc
index 4b885d3053..441c6e2a88 100644
--- a/docs/modules/servers/pages/distributed/run/k8s-values.adoc
+++ b/docs/modules/servers/pages/distributed/run/k8s-values.adoc
@@ -94,9 +94,6 @@ allocation when starting James
|jamesResources.requests.memory |3Gi |Request of memory allowed to James
pod
-|glowroot.enabled |true |Enabling or disabling Glowroot usage with
-James. It’s better to disable it for prod environments
-
|ingress.enabled |false |Enabling or disabling Ingress. We are
using it to expose JMAP and attach our SSL certificates for
SMTP/IMAP/JMAP. Default is false
diff --git a/docs/modules/servers/pages/distributed/run/run-docker.adoc
b/docs/modules/servers/pages/distributed/run/run-docker.adoc
index d05ab013c1..8e00e84666 100644
--- a/docs/modules/servers/pages/distributed/run/run-docker.adoc
+++ b/docs/modules/servers/pages/distributed/run/run-docker.adoc
@@ -125,19 +125,6 @@ following command, and drop `--generate-keystore` option:
$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
----
-=== Instrumentation
-You can use link:https://glowroot.org/[Glowroot] to instrumentalize James. It
is packaged as part of the docker distribution to easily enable valuable
performances insights.
-Disabled by default, its java agent can easily be enabled:
-
- --env "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar" -p "4000:4000"
-
-By default, the Glowroot UI is accessible from every machines in the network
as defined in the _destination/admin.json_.
-Which you could configure before building the image, if you want to restrict
its accessibility to localhost for example.
-See the
https://github.com/glowroot/glowroot/wiki/Agent-Installation-(with-Embedded-Collector)#user-content-optional-post-installation-steps[Glowroot
post installation steps] for more details.
-
-Or by mapping the 4000 port to the IP of the desired network interface, for
example `-p 127.0.0.1:4000:4000`.
-
-
=== Handling attachment indexing
You can handle attachment text extraction before indexing in OpenSearch. This
makes attachments searchable. To enable this:
diff --git a/docs/modules/servers/pages/jpa/run/run-docker.adoc
b/docs/modules/servers/pages/jpa/run/run-docker.adoc
index 3d414d6745..b1026e7cb7 100644
--- a/docs/modules/servers/pages/jpa/run/run-docker.adoc
+++ b/docs/modules/servers/pages/jpa/run/run-docker.adoc
@@ -59,14 +59,6 @@ The xref:jpa/operate/cli.adoc[CLI] can easily be used:
$ docker exec CONTAINER-ID james-cli ListDomains
----
-link:https://glowroot.org/[Glowroot APM] is packaged as part of the docker
distribution to easily enable valuable
-performance insights. Disabled by default, its java agent can easily be
enabled:
-
-[source,bash]
-----
-$ docker run -e "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:jpa-latest
-----
-
== Running via docker-compose
We do ship a
diff --git a/docs/modules/servers/pages/jpa/smtp-only.adoc
b/docs/modules/servers/pages/jpa/smtp-only.adoc
index b8e48ff0e8..0f815f58fe 100644
--- a/docs/modules/servers/pages/jpa/smtp-only.adoc
+++ b/docs/modules/servers/pages/jpa/smtp-only.adoc
@@ -180,14 +180,6 @@
link:https://github.com/GoogleContainerTools/jib/blob/master/docs/faq.md#jvm-fla
$ docker run --environment DOMAIN=domain.tld -e "JAVA_TOOL_OPTIONS=-Xmx500m
-Xms500m" apache/james:jpa-smtp-latest
----
-link:https://glowroot.org/[Glowroot APM] is packaged within the image.
Disabled by default, its java agent can be
-enabled:
-
-[source,bash]
-----
-$ docker run -e "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:jpa-smtp-latest
-----
-
=== Running via docker-compose on top of MariaDB
A
link:https://github.com/apache/james-project/blob/master/server/apps/jpa-smtp-app/docker-compose.yml[docker-compose]
diff --git a/docs/modules/servers/pages/postgres/run/run-docker.adoc
b/docs/modules/servers/pages/postgres/run/run-docker.adoc
index ba5e6c4277..853a98bf6b 100644
--- a/docs/modules/servers/pages/postgres/run/run-docker.adoc
+++ b/docs/modules/servers/pages/postgres/run/run-docker.adoc
@@ -132,19 +132,6 @@ following command, and drop `--generate-keystore` option:
$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
----
-=== Instrumentation
-You can use link:https://glowroot.org/[Glowroot] to instrumentalize James. It
is packaged as part of the docker distribution to easily enable valuable
performances insights.
-Disabled by default, its java agent can easily be enabled:
-
- --env "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar" -p "4000:4000"
-
-By default, the Glowroot UI is accessible from every machines in the network
as defined in the _destination/admin.json_.
-Which you could configure before building the image, if you want to restrict
its accessibility to localhost for example.
-See the
https://github.com/glowroot/glowroot/wiki/Agent-Installation-(with-Embedded-Collector)#user-content-optional-post-installation-steps[Glowroot
post installation steps] for more details.
-
-Or by mapping the 4000 port to the IP of the desired network interface, for
example `-p 127.0.0.1:4000:4000`.
-
-
=== Handling attachment indexing
You can handle attachment text extraction before indexing in OpenSearch. This
makes attachments searchable. To enable this:
diff --git a/pom.xml b/pom.xml
index 2aef2bf968..4dc6b4b1b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3172,11 +3172,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <version>1.13.0</version>
- </plugin>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
diff --git a/server/apps/distributed-app/README.adoc
b/server/apps/distributed-app/README.adoc
index aa0aa9a214..403238de3f 100644
--- a/server/apps/distributed-app/README.adoc
+++ b/server/apps/distributed-app/README.adoc
@@ -50,17 +50,6 @@ to pass extra JVM flags. For instance:
- JAVA_TOOL_OPTIONS=-Xmx500m -Xms500m
----
-[Glowroot APM](https://glowroot.org/) is packaged as part of the docker
distribution to easily enable valuable performances insights.
-Disabled by default, its java agent can easily be enabled:
-
-
-[source]
-----
- james:
- ...
- environment:
- - JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar
-----
The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used:
diff --git
a/server/apps/distributed-app/helm-chart/james/templates/_helpers.tpl
b/server/apps/distributed-app/helm-chart/james/templates/_helpers.tpl
index 8d4d75a4c3..4f9d769840 100644
--- a/server/apps/distributed-app/helm-chart/james/templates/_helpers.tpl
+++ b/server/apps/distributed-app/helm-chart/james/templates/_helpers.tpl
@@ -2,9 +2,5 @@
Builds up the JAVA_TOOL_OPTIONS env variable for java tunning James
*/}}
{{- define "james.jvmOpts" -}}
-{{- if .Values.james.env.glowroot.enabled }}
-{{- printf "%s -javaagent:/root/glowroot/glowroot.jar"
.Values.james.env.jvmOpts }}
-{{- else }}
{{- .Values.james.env.jvmOpts }}
-{{- end }}
{{- end }}
\ No newline at end of file
diff --git a/server/apps/distributed-app/helm-chart/james/values.schema.json
b/server/apps/distributed-app/helm-chart/james/values.schema.json
index 94c72d8e58..07729e7977 100644
--- a/server/apps/distributed-app/helm-chart/james/values.schema.json
+++ b/server/apps/distributed-app/helm-chart/james/values.schema.json
@@ -128,14 +128,6 @@
}
}
}
- },
- "glowroot": {
- "type": "object",
- "properties": {
- "enabled": {
- "type": "boolean"
- }
- }
}
},
"required": [
@@ -157,8 +149,7 @@
"jamesHELOMessage",
"cassandraReplicationFactor",
"jvmOpts",
- "jamesResources",
- "glowroot"
+ "jamesResources"
],
"additionalProperties": false
},
diff --git a/server/apps/distributed-app/helm-chart/james/values.yaml
b/server/apps/distributed-app/helm-chart/james/values.yaml
index 1d05e44600..6864124956 100644
--- a/server/apps/distributed-app/helm-chart/james/values.yaml
+++ b/server/apps/distributed-app/helm-chart/james/values.yaml
@@ -30,8 +30,6 @@ james:
cassandraReplicationFactor: 3
jamesHELOMessage: "change-me"
jvmOpts: "-Xms3g -Xmx3g"
- glowroot:
- enabled: false
jamesResources:
limits:
cpu: "2000m"
diff --git a/server/apps/distributed-app/pom.xml
b/server/apps/distributed-app/pom.xml
index 75c08436cd..0ae1491531 100644
--- a/server/apps/distributed-app/pom.xml
+++ b/server/apps/distributed-app/pom.xml
@@ -371,47 +371,6 @@
<build>
<plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-glowroot</id>
- <goals>
- <goal>wget</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<url>https://github.com/glowroot/glowroot/releases/download/v0.14.0/glowroot-0.14.0-dist.zip</url>
- <unpack>true</unpack>
-
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>16073f10204751cd71d3b4ea93be2649</md5>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-glowroot-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<outputDirectory>${basedir}/target/glowroot</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/glowroot</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
@@ -440,8 +399,6 @@
<!-- SMTP + STARTTLS -->
<port>587</port>
<!-- SMTPS -->
- <port>4000</port>
- <!-- GLOWROOT, if activated -->
<port>8000</port>
<!-- WEBADMIN -->
</ports>
@@ -458,8 +415,6 @@
<volume>/logs</volume>
<volume>/root/conf</volume>
<volume>/root/extensions-jars</volume>
- <volume>/root/glowroot/plugins</volume>
- <volume>/root/glowroot/data</volume>
</volumes>
</container>
<extraDirectories>
@@ -476,10 +431,6 @@
<from>src/main/scripts</from>
<into>/usr/bin</into>
</path>
- <path>
- <from>target/glowroot</from>
- <into>/root</into>
- </path>
<path>
<from>src/main/extensions-jars</from>
<into>/root/extensions-jars</into>
diff --git a/server/apps/distributed-app/src/main/glowroot/admin.json
b/server/apps/distributed-app/src/main/glowroot/admin.json
deleted file mode 100644
index c75c59d555..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/admin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "web": {
- "bindAddress": "0.0.0.0"
- }
-}
\ No newline at end of file
diff --git
a/server/apps/distributed-app/src/main/glowroot/plugins/blobstore.json
b/server/apps/distributed-app/src/main/glowroot/plugins/blobstore.json
deleted file mode 100644
index 84291c6e16..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/plugins/blobstore.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "name": "BlobStore Plugin",
- "id": "blob_store",
- "instrumentation": [
- {
- "captureKind": "trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "blobstore",
- "className": "org.apache.james.blob.objectstorage.BlobPutter",
- "methodName": "putDirectly",
- "methodParameterTypes": [
- ".."
- ]
- },
- {
- "captureKind": "trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "blobstore",
- "className": "org.apache.james.blob.objectstorage.BlobPutter",
- "methodName": "putAndComputeId",
- "methodParameterTypes": [
- ".."
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/distributed-app/src/main/glowroot/plugins/imap.json
b/server/apps/distributed-app/src/main/glowroot/plugins/imap.json
deleted file mode 100644
index d27904feb5..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/plugins/imap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "IMAP Plugin",
- "id": "imap",
- "instrumentation": [
- {
- "className":
"org.apache.james.imap.processor.base.AbstractChainedProcessor",
- "methodName": "doProcess",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "IMAP",
- "transactionNameTemplate": "IMAP processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "imapProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/distributed-app/src/main/glowroot/plugins/jmap.json
b/server/apps/distributed-app/src/main/glowroot/plugins/jmap.json
deleted file mode 100644
index 79d6caeac4..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/plugins/jmap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "JMAP Plugin",
- "id": "jmap",
- "instrumentation": [
- {
- "className": "org.apache.james.jmap.methods.Method",
- "methodName": "processToStream",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "JMAP",
- "transactionNameTemplate": "JMAP method : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-new-transaction",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "jmapMethod"
- }
- ]
-}
\ No newline at end of file
diff --git
a/server/apps/distributed-app/src/main/glowroot/plugins/mailboxListener.json
b/server/apps/distributed-app/src/main/glowroot/plugins/mailboxListener.json
deleted file mode 100644
index 54a55ac1e4..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/plugins/mailboxListener.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "MailboxListener Plugin",
- "id": "mailboxListener",
- "instrumentation": [
- {
- "className": "org.apache.james.mailbox.events.MailboxListener",
- "methodName": "event",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "MailboxListener",
- "transactionNameTemplate": "MailboxListener : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailboxListener"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/distributed-app/src/main/glowroot/plugins/pop3.json
b/server/apps/distributed-app/src/main/glowroot/plugins/pop3.json
deleted file mode 100644
index a5bcdccce1..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/plugins/pop3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "POP3 Plugin",
- "id": "pop3",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.pop3.core.AbstractPOP3CommandHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "POP3",
- "transactionNameTemplate": "POP3 Command: {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "pop3Timer"
- }
- ]
-}
diff --git a/server/apps/distributed-app/src/main/glowroot/plugins/smtp.json
b/server/apps/distributed-app/src/main/glowroot/plugins/smtp.json
deleted file mode 100644
index 393bac9d9c..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/plugins/smtp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "SMTP Plugin",
- "id": "smtp",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "SMTP",
- "transactionNameTemplate": "SMTP command : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "smtpProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/distributed-app/src/main/glowroot/plugins/spooler.json
b/server/apps/distributed-app/src/main/glowroot/plugins/spooler.json
deleted file mode 100644
index 5937ca5dbc..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/plugins/spooler.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "name": "Spooler Plugin",
- "id": "spooler",
- "instrumentation": [
- {
- "className": "org.apache.james.mailetcontainer.api.MailProcessor",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Spooler",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailetProcessor"
- },
- {
- "className": "org.apache.mailet.Mailet",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Mailet",
- "transactionNameTemplate": "Mailet : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-new-transaction",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailet"
- },
- {
- "className": "org.apache.mailet.Matcher",
- "methodName": "match",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Matcher",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-new-transaction",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "matcher"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/distributed-app/src/main/glowroot/plugins/task.json
b/server/apps/distributed-app/src/main/glowroot/plugins/task.json
deleted file mode 100644
index 8f04c69e74..0000000000
--- a/server/apps/distributed-app/src/main/glowroot/plugins/task.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "Task Plugin",
- "id": "task",
- "instrumentation": [
- {
- "className": "org.apache.james.task.Task",
- "methodName": "run",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "TASK",
- "transactionNameTemplate": "TASK : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "task"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/distributed-pop3-app/README.adoc
b/server/apps/distributed-pop3-app/README.adoc
index 48f64d1c86..a680c908ca 100644
--- a/server/apps/distributed-pop3-app/README.adoc
+++ b/server/apps/distributed-pop3-app/README.adoc
@@ -64,13 +64,6 @@ to pass extra JVM flags. For instance:
docker run --network james -e "JAVA_TOOL_OPTIONS=-Xmx500m -Xms500m"
apache/james:distributed-pop3-latest
----
-[Glowroot APM](https://glowroot.org/) is packaged as part of the docker
distribution to easily enable valuable performances insights.
-Disabled by default, its java agent can easily be enabled:
-
-[source]
-----
-docker run --network james -e
"JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:distributed-pop3-latest
-----
The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used:
diff --git a/server/apps/distributed-pop3-app/pom.xml
b/server/apps/distributed-pop3-app/pom.xml
index 9e31b59e64..e3912a97c9 100644
--- a/server/apps/distributed-pop3-app/pom.xml
+++ b/server/apps/distributed-pop3-app/pom.xml
@@ -343,47 +343,6 @@
<build>
<plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-glowroot</id>
- <goals>
- <goal>wget</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<url>https://github.com/glowroot/glowroot/releases/download/v0.14.0/glowroot-0.14.0-dist.zip</url>
- <unpack>true</unpack>
-
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>16073f10204751cd71d3b4ea93be2649</md5>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-glowroot-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<outputDirectory>${basedir}/target/glowroot</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/glowroot</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
@@ -423,8 +382,6 @@
<volume>/logs</volume>
<volume>/root/conf</volume>
<volume>/root/extensions-jars</volume>
- <volume>/root/glowroot/plugins</volume>
- <volume>/root/glowroot/data</volume>
</volumes>
</container>
<extraDirectories>
@@ -441,10 +398,6 @@
<from>src/main/scripts</from>
<into>/usr/bin</into>
</path>
- <path>
- <from>target/glowroot</from>
- <into>/root</into>
- </path>
<path>
<from>src/main/extensions-jars</from>
<into>/root/extensions-jars</into>
diff --git a/server/apps/distributed-pop3-app/src/main/glowroot/admin.json
b/server/apps/distributed-pop3-app/src/main/glowroot/admin.json
deleted file mode 100644
index c75c59d555..0000000000
--- a/server/apps/distributed-pop3-app/src/main/glowroot/admin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "web": {
- "bindAddress": "0.0.0.0"
- }
-}
\ No newline at end of file
diff --git
a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/blobstore.json
b/server/apps/distributed-pop3-app/src/main/glowroot/plugins/blobstore.json
deleted file mode 100644
index 84291c6e16..0000000000
--- a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/blobstore.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "name": "BlobStore Plugin",
- "id": "blob_store",
- "instrumentation": [
- {
- "captureKind": "trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "blobstore",
- "className": "org.apache.james.blob.objectstorage.BlobPutter",
- "methodName": "putDirectly",
- "methodParameterTypes": [
- ".."
- ]
- },
- {
- "captureKind": "trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "blobstore",
- "className": "org.apache.james.blob.objectstorage.BlobPutter",
- "methodName": "putAndComputeId",
- "methodParameterTypes": [
- ".."
- ]
- }
- ]
-}
\ No newline at end of file
diff --git
a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/mailboxListener.json
b/server/apps/distributed-pop3-app/src/main/glowroot/plugins/mailboxListener.json
deleted file mode 100644
index 54a55ac1e4..0000000000
---
a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/mailboxListener.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "MailboxListener Plugin",
- "id": "mailboxListener",
- "instrumentation": [
- {
- "className": "org.apache.james.mailbox.events.MailboxListener",
- "methodName": "event",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "MailboxListener",
- "transactionNameTemplate": "MailboxListener : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailboxListener"
- }
- ]
-}
\ No newline at end of file
diff --git
a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/pop3.json
b/server/apps/distributed-pop3-app/src/main/glowroot/plugins/pop3.json
deleted file mode 100644
index a5bcdccce1..0000000000
--- a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/pop3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "POP3 Plugin",
- "id": "pop3",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.pop3.core.AbstractPOP3CommandHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "POP3",
- "transactionNameTemplate": "POP3 Command: {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "pop3Timer"
- }
- ]
-}
diff --git
a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/smtp.json
b/server/apps/distributed-pop3-app/src/main/glowroot/plugins/smtp.json
deleted file mode 100644
index 393bac9d9c..0000000000
--- a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/smtp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "SMTP Plugin",
- "id": "smtp",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "SMTP",
- "transactionNameTemplate": "SMTP command : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "smtpProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git
a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/spooler.json
b/server/apps/distributed-pop3-app/src/main/glowroot/plugins/spooler.json
deleted file mode 100644
index 5937ca5dbc..0000000000
--- a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/spooler.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "name": "Spooler Plugin",
- "id": "spooler",
- "instrumentation": [
- {
- "className": "org.apache.james.mailetcontainer.api.MailProcessor",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Spooler",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailetProcessor"
- },
- {
- "className": "org.apache.mailet.Mailet",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Mailet",
- "transactionNameTemplate": "Mailet : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-new-transaction",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailet"
- },
- {
- "className": "org.apache.mailet.Matcher",
- "methodName": "match",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Matcher",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-new-transaction",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "matcher"
- }
- ]
-}
\ No newline at end of file
diff --git
a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/task.json
b/server/apps/distributed-pop3-app/src/main/glowroot/plugins/task.json
deleted file mode 100644
index 8f04c69e74..0000000000
--- a/server/apps/distributed-pop3-app/src/main/glowroot/plugins/task.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "Task Plugin",
- "id": "task",
- "instrumentation": [
- {
- "className": "org.apache.james.task.Task",
- "methodName": "run",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "TASK",
- "transactionNameTemplate": "TASK : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "task"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-app/README.adoc b/server/apps/jpa-app/README.adoc
index f8583f68de..e4841169fa 100644
--- a/server/apps/jpa-app/README.adoc
+++ b/server/apps/jpa-app/README.adoc
@@ -74,15 +74,6 @@ James will auto-generate keystore file with the default
setting that is declared
docker run --network james apache/james:jpa-latest --generate-keystore
----
-[Glowroot APM](https://glowroot.org/) is packaged as part of the docker
distribution to easily enable valuable performances insights.
-Disabled by default, its java agent can easily be enabled:
-
-
-[source]
-----
-docker run -e "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:jpa-latest
-----
-
The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used:
diff --git a/server/apps/jpa-app/pom.xml b/server/apps/jpa-app/pom.xml
index 5f068f1dc0..f82bb8468c 100644
--- a/server/apps/jpa-app/pom.xml
+++ b/server/apps/jpa-app/pom.xml
@@ -226,47 +226,6 @@
<build>
<plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-glowroot</id>
- <goals>
- <goal>wget</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<url>https://github.com/glowroot/glowroot/releases/download/v0.14.0/glowroot-0.14.0-dist.zip</url>
- <unpack>true</unpack>
-
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>16073f10204751cd71d3b4ea93be2649</md5>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-glowroot-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<outputDirectory>${basedir}/target/glowroot</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/glowroot</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
@@ -295,8 +254,6 @@
<!-- SMTP + STARTTLS -->
<port>587</port>
<!-- SMTPS -->
- <port>4000</port>
- <!-- GLOWROOT, if activated -->
<port>8000</port>
<!-- WEBADMIN -->
</ports>
@@ -313,8 +270,6 @@
<volume>/logs</volume>
<volume>/root/conf</volume>
<volume>/root/extensions-jars</volume>
- <volume>/root/glowroot/plugins</volume>
- <volume>/root/glowroot/data</volume>
<!-- Data for ActiveMQ mailQueue -->
<volume>/root/var</volume>
<!-- Data for H2 database -->
@@ -336,10 +291,6 @@
<from>src/main/scripts</from>
<into>/usr/bin</into>
</path>
- <path>
- <from>target/glowroot</from>
- <into>/root</into>
- </path>
<path>
<from>src/main/extensions-jars</from>
<into>/root/extensions-jars</into>
diff --git a/server/apps/jpa-app/src/main/glowroot/admin.json
b/server/apps/jpa-app/src/main/glowroot/admin.json
deleted file mode 100644
index c75c59d555..0000000000
--- a/server/apps/jpa-app/src/main/glowroot/admin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "web": {
- "bindAddress": "0.0.0.0"
- }
-}
\ No newline at end of file
diff --git a/server/apps/jpa-app/src/main/glowroot/plugins/imap.json
b/server/apps/jpa-app/src/main/glowroot/plugins/imap.json
deleted file mode 100644
index d27904feb5..0000000000
--- a/server/apps/jpa-app/src/main/glowroot/plugins/imap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "IMAP Plugin",
- "id": "imap",
- "instrumentation": [
- {
- "className":
"org.apache.james.imap.processor.base.AbstractChainedProcessor",
- "methodName": "doProcess",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "IMAP",
- "transactionNameTemplate": "IMAP processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "imapProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-app/src/main/glowroot/plugins/jmap.json
b/server/apps/jpa-app/src/main/glowroot/plugins/jmap.json
deleted file mode 100644
index aa5a6074d9..0000000000
--- a/server/apps/jpa-app/src/main/glowroot/plugins/jmap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "JMAP Plugin",
- "id": "jmap",
- "instrumentation": [
- {
- "className": "org.apache.james.jmap.methods.Method",
- "methodName": "processToStream",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "JMAP",
- "transactionNameTemplate": "JMAP method : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "jmapMethod"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-app/src/main/glowroot/plugins/mailboxListener.json
b/server/apps/jpa-app/src/main/glowroot/plugins/mailboxListener.json
deleted file mode 100644
index 54a55ac1e4..0000000000
--- a/server/apps/jpa-app/src/main/glowroot/plugins/mailboxListener.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "MailboxListener Plugin",
- "id": "mailboxListener",
- "instrumentation": [
- {
- "className": "org.apache.james.mailbox.events.MailboxListener",
- "methodName": "event",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "MailboxListener",
- "transactionNameTemplate": "MailboxListener : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailboxListener"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-app/src/main/glowroot/plugins/pop3.json
b/server/apps/jpa-app/src/main/glowroot/plugins/pop3.json
deleted file mode 100644
index a5bcdccce1..0000000000
--- a/server/apps/jpa-app/src/main/glowroot/plugins/pop3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "POP3 Plugin",
- "id": "pop3",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.pop3.core.AbstractPOP3CommandHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "POP3",
- "transactionNameTemplate": "POP3 Command: {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "pop3Timer"
- }
- ]
-}
diff --git a/server/apps/jpa-app/src/main/glowroot/plugins/smtp.json
b/server/apps/jpa-app/src/main/glowroot/plugins/smtp.json
deleted file mode 100644
index 393bac9d9c..0000000000
--- a/server/apps/jpa-app/src/main/glowroot/plugins/smtp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "SMTP Plugin",
- "id": "smtp",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "SMTP",
- "transactionNameTemplate": "SMTP command : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "smtpProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-app/src/main/glowroot/plugins/spooler.json
b/server/apps/jpa-app/src/main/glowroot/plugins/spooler.json
deleted file mode 100644
index fd7732de8b..0000000000
--- a/server/apps/jpa-app/src/main/glowroot/plugins/spooler.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "name": "Spooler Plugin",
- "id": "spooler",
- "instrumentation": [
- {
- "className": "org.apache.james.mailetcontainer.api.MailProcessor",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Spooler",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailetProcessor"
- },
- {
- "className": "org.apache.mailet.Mailet",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Mailet",
- "transactionNameTemplate": "Mailet : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailet"
- },
- {
- "className": "org.apache.mailet.Matcher",
- "methodName": "match",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Matcher",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "matcher"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-app/src/main/glowroot/plugins/task.json
b/server/apps/jpa-app/src/main/glowroot/plugins/task.json
deleted file mode 100644
index 8f04c69e74..0000000000
--- a/server/apps/jpa-app/src/main/glowroot/plugins/task.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "Task Plugin",
- "id": "task",
- "instrumentation": [
- {
- "className": "org.apache.james.task.Task",
- "methodName": "run",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "TASK",
- "transactionNameTemplate": "TASK : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "task"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-smtp-app/README.adoc
b/server/apps/jpa-smtp-app/README.adoc
index 5b05c4dea3..2fd558be1c 100644
--- a/server/apps/jpa-smtp-app/README.adoc
+++ b/server/apps/jpa-smtp-app/README.adoc
@@ -77,14 +77,6 @@ to pass extra JVM flags. For instance:
docker run -e "JAVA_TOOL_OPTIONS=-Xmx500m -Xms500m"
apache/james:jpa-smtp-latest
----
-[Glowroot APM](https://glowroot.org/) is packaged as part of the docker
distribution to easily enable valuable performances insights.
-Disabled by default, its java agent can easily be enabled:
-
-
-[source]
-----
-docker run -e "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:jpa-smtp-latest
-----
The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used:
diff --git a/server/apps/jpa-smtp-app/pom.xml b/server/apps/jpa-smtp-app/pom.xml
index 42595e55bd..3ee63da470 100644
--- a/server/apps/jpa-smtp-app/pom.xml
+++ b/server/apps/jpa-smtp-app/pom.xml
@@ -202,47 +202,6 @@
<build>
<plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-glowroot</id>
- <goals>
- <goal>wget</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<url>https://github.com/glowroot/glowroot/releases/download/v0.14.0/glowroot-0.14.0-dist.zip</url>
- <unpack>true</unpack>
-
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>16073f10204751cd71d3b4ea93be2649</md5>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-glowroot-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<outputDirectory>${basedir}/target/glowroot</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/glowroot</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -284,8 +243,6 @@
<!-- SMTP + STARTTLS -->
<port>587</port>
<!-- SMTPS -->
- <port>4000</port>
- <!-- GLOWROOT, if activated -->
<port>8000</port>
<!-- WEBADMIN -->
</ports>
@@ -305,8 +262,6 @@
<volume>/root/var</volume>
<!-- Data for H2 database -->
<volume>/var/store</volume>
- <volume>/root/glowroot/plugins</volume>
- <volume>/root/glowroot/data</volume>
<volume>/root/extensions-jars</volume>
</volumes>
<extraClasspath>/root/libs/james-jdbc-driver.jar</extraClasspath>
@@ -325,10 +280,6 @@
<from>src/main/scripts</from>
<into>/usr/bin</into>
</path>
- <path>
- <from>target/glowroot</from>
- <into>/root</into>
- </path>
<path>
<from>src/main/extensions-jars</from>
<into>/root/extensions-jars</into>
diff --git a/server/apps/jpa-smtp-app/src/main/glowroot/admin.json
b/server/apps/jpa-smtp-app/src/main/glowroot/admin.json
deleted file mode 100644
index c75c59d555..0000000000
--- a/server/apps/jpa-smtp-app/src/main/glowroot/admin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "web": {
- "bindAddress": "0.0.0.0"
- }
-}
\ No newline at end of file
diff --git a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/imap.json
b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/imap.json
deleted file mode 100644
index d27904feb5..0000000000
--- a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/imap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "IMAP Plugin",
- "id": "imap",
- "instrumentation": [
- {
- "className":
"org.apache.james.imap.processor.base.AbstractChainedProcessor",
- "methodName": "doProcess",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "IMAP",
- "transactionNameTemplate": "IMAP processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "imapProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/jmap.json
b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/jmap.json
deleted file mode 100644
index aa5a6074d9..0000000000
--- a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/jmap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "JMAP Plugin",
- "id": "jmap",
- "instrumentation": [
- {
- "className": "org.apache.james.jmap.methods.Method",
- "methodName": "processToStream",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "JMAP",
- "transactionNameTemplate": "JMAP method : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "jmapMethod"
- }
- ]
-}
\ No newline at end of file
diff --git
a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/mailboxListener.json
b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/mailboxListener.json
deleted file mode 100644
index 54a55ac1e4..0000000000
--- a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/mailboxListener.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "MailboxListener Plugin",
- "id": "mailboxListener",
- "instrumentation": [
- {
- "className": "org.apache.james.mailbox.events.MailboxListener",
- "methodName": "event",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "MailboxListener",
- "transactionNameTemplate": "MailboxListener : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailboxListener"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/pop3.json
b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/pop3.json
deleted file mode 100644
index a5bcdccce1..0000000000
--- a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/pop3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "POP3 Plugin",
- "id": "pop3",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.pop3.core.AbstractPOP3CommandHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "POP3",
- "transactionNameTemplate": "POP3 Command: {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "pop3Timer"
- }
- ]
-}
diff --git a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/smtp.json
b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/smtp.json
deleted file mode 100644
index 393bac9d9c..0000000000
--- a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/smtp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "SMTP Plugin",
- "id": "smtp",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "SMTP",
- "transactionNameTemplate": "SMTP command : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "smtpProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/spooler.json
b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/spooler.json
deleted file mode 100644
index fd7732de8b..0000000000
--- a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/spooler.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "name": "Spooler Plugin",
- "id": "spooler",
- "instrumentation": [
- {
- "className": "org.apache.james.mailetcontainer.api.MailProcessor",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Spooler",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailetProcessor"
- },
- {
- "className": "org.apache.mailet.Mailet",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Mailet",
- "transactionNameTemplate": "Mailet : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailet"
- },
- {
- "className": "org.apache.mailet.Matcher",
- "methodName": "match",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Matcher",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "matcher"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/task.json
b/server/apps/jpa-smtp-app/src/main/glowroot/plugins/task.json
deleted file mode 100644
index 8f04c69e74..0000000000
--- a/server/apps/jpa-smtp-app/src/main/glowroot/plugins/task.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "Task Plugin",
- "id": "task",
- "instrumentation": [
- {
- "className": "org.apache.james.task.Task",
- "methodName": "run",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "TASK",
- "transactionNameTemplate": "TASK : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "task"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/memory-app/README.md b/server/apps/memory-app/README.md
index 931675f30e..47d5e51617 100644
--- a/server/apps/memory-app/README.md
+++ b/server/apps/memory-app/README.md
@@ -48,12 +48,6 @@ to pass extra JVM flags. For instance:
docker run -e "JAVA_TOOL_OPTIONS=-Xmx500m -Xms500m" apache/james:memory-latest
```
-[Glowroot APM](https://glowroot.org/) is packaged as part of the docker
distribution to easily enable valuable performances insights.
-Disabled by default, its java agent can easily be enabled:
-
-```
-docker run -e "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:memory-latest
-```
The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used:
```
diff --git a/server/apps/memory-app/pom.xml b/server/apps/memory-app/pom.xml
index 76f748f5ef..d7f9a51a79 100644
--- a/server/apps/memory-app/pom.xml
+++ b/server/apps/memory-app/pom.xml
@@ -263,47 +263,6 @@
<build>
<plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-glowroot</id>
- <goals>
- <goal>wget</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<url>https://github.com/glowroot/glowroot/releases/download/v0.14.0/glowroot-0.14.0-dist.zip</url>
- <unpack>true</unpack>
-
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>16073f10204751cd71d3b4ea93be2649</md5>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-glowroot-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<outputDirectory>${basedir}/target/glowroot</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/glowroot</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
@@ -332,8 +291,6 @@
<!-- SMTP + STARTTLS -->
<port>587</port>
<!-- SMTPS -->
- <port>4000</port>
- <!-- GLOWROOT, if activated -->
<port>8000</port>
<!-- WEBADMIN -->
</ports>
@@ -349,8 +306,6 @@
<volumes>
<volume>/logs</volume>
<volume>/root/conf</volume>
- <volume>/root/glowroot/plugins</volume>
- <volume>/root/glowroot/data</volume>
<volume>/root/extensions-jars</volume>
</volumes>
</container>
@@ -368,10 +323,6 @@
<from>src/main/scripts</from>
<into>/usr/bin</into>
</path>
- <path>
- <from>target/glowroot</from>
- <into>/root</into>
- </path>
<path>
<from>src/main/extensions-jars</from>
<into>/root/extensions-jars</into>
diff --git a/server/apps/memory-app/src/main/glowroot/admin.json
b/server/apps/memory-app/src/main/glowroot/admin.json
deleted file mode 100644
index c75c59d555..0000000000
--- a/server/apps/memory-app/src/main/glowroot/admin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "web": {
- "bindAddress": "0.0.0.0"
- }
-}
\ No newline at end of file
diff --git a/server/apps/memory-app/src/main/glowroot/plugins/imap.json
b/server/apps/memory-app/src/main/glowroot/plugins/imap.json
deleted file mode 100644
index d27904feb5..0000000000
--- a/server/apps/memory-app/src/main/glowroot/plugins/imap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "IMAP Plugin",
- "id": "imap",
- "instrumentation": [
- {
- "className":
"org.apache.james.imap.processor.base.AbstractChainedProcessor",
- "methodName": "doProcess",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "IMAP",
- "transactionNameTemplate": "IMAP processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "imapProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/memory-app/src/main/glowroot/plugins/jmap.json
b/server/apps/memory-app/src/main/glowroot/plugins/jmap.json
deleted file mode 100644
index aa5a6074d9..0000000000
--- a/server/apps/memory-app/src/main/glowroot/plugins/jmap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "JMAP Plugin",
- "id": "jmap",
- "instrumentation": [
- {
- "className": "org.apache.james.jmap.methods.Method",
- "methodName": "processToStream",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "JMAP",
- "transactionNameTemplate": "JMAP method : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "jmapMethod"
- }
- ]
-}
\ No newline at end of file
diff --git
a/server/apps/memory-app/src/main/glowroot/plugins/mailboxListener.json
b/server/apps/memory-app/src/main/glowroot/plugins/mailboxListener.json
deleted file mode 100644
index 54a55ac1e4..0000000000
--- a/server/apps/memory-app/src/main/glowroot/plugins/mailboxListener.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "MailboxListener Plugin",
- "id": "mailboxListener",
- "instrumentation": [
- {
- "className": "org.apache.james.mailbox.events.MailboxListener",
- "methodName": "event",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "MailboxListener",
- "transactionNameTemplate": "MailboxListener : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailboxListener"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/memory-app/src/main/glowroot/plugins/pop3.json
b/server/apps/memory-app/src/main/glowroot/plugins/pop3.json
deleted file mode 100644
index a5bcdccce1..0000000000
--- a/server/apps/memory-app/src/main/glowroot/plugins/pop3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "POP3 Plugin",
- "id": "pop3",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.pop3.core.AbstractPOP3CommandHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "POP3",
- "transactionNameTemplate": "POP3 Command: {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "pop3Timer"
- }
- ]
-}
diff --git a/server/apps/memory-app/src/main/glowroot/plugins/smtp.json
b/server/apps/memory-app/src/main/glowroot/plugins/smtp.json
deleted file mode 100644
index 393bac9d9c..0000000000
--- a/server/apps/memory-app/src/main/glowroot/plugins/smtp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "SMTP Plugin",
- "id": "smtp",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "SMTP",
- "transactionNameTemplate": "SMTP command : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "smtpProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/memory-app/src/main/glowroot/plugins/spooler.json
b/server/apps/memory-app/src/main/glowroot/plugins/spooler.json
deleted file mode 100644
index fd7732de8b..0000000000
--- a/server/apps/memory-app/src/main/glowroot/plugins/spooler.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "name": "Spooler Plugin",
- "id": "spooler",
- "instrumentation": [
- {
- "className": "org.apache.james.mailetcontainer.api.MailProcessor",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Spooler",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailetProcessor"
- },
- {
- "className": "org.apache.mailet.Mailet",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Mailet",
- "transactionNameTemplate": "Mailet : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailet"
- },
- {
- "className": "org.apache.mailet.Matcher",
- "methodName": "match",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Matcher",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "matcher"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/memory-app/src/main/glowroot/plugins/task.json
b/server/apps/memory-app/src/main/glowroot/plugins/task.json
deleted file mode 100644
index 8f04c69e74..0000000000
--- a/server/apps/memory-app/src/main/glowroot/plugins/task.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "Task Plugin",
- "id": "task",
- "instrumentation": [
- {
- "className": "org.apache.james.task.Task",
- "methodName": "run",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "TASK",
- "transactionNameTemplate": "TASK : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "task"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/postgres-app/pom.xml b/server/apps/postgres-app/pom.xml
index dd25d10269..d2c01747f2 100644
--- a/server/apps/postgres-app/pom.xml
+++ b/server/apps/postgres-app/pom.xml
@@ -305,47 +305,6 @@
<build>
<plugins>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-glowroot</id>
- <goals>
- <goal>wget</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<url>https://github.com/glowroot/glowroot/releases/download/v0.14.0/glowroot-0.14.0-dist.zip</url>
- <unpack>true</unpack>
-
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>16073f10204751cd71d3b4ea93be2649</md5>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-glowroot-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<outputDirectory>${basedir}/target/glowroot</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/glowroot</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
@@ -374,8 +333,6 @@
<!-- SMTP + STARTTLS -->
<port>587</port>
<!-- SMTPS -->
- <port>4000</port>
- <!-- GLOWROOT, if activated -->
<port>8000</port>
<!-- WEBADMIN -->
</ports>
@@ -392,8 +349,6 @@
<volume>/logs</volume>
<volume>/root/conf</volume>
<volume>/root/extensions-jars</volume>
- <volume>/root/glowroot/plugins</volume>
- <volume>/root/glowroot/data</volume>
<!-- Data for ActiveMQ mailQueue -->
<volume>/root/var</volume>
</volumes>
@@ -412,10 +367,6 @@
<from>src/main/scripts</from>
<into>/usr/bin</into>
</path>
- <path>
- <from>target/glowroot</from>
- <into>/root</into>
- </path>
<path>
<from>src/main/extensions-jars</from>
<into>/root/extensions-jars</into>
diff --git a/server/apps/postgres-app/src/main/glowroot/admin.json
b/server/apps/postgres-app/src/main/glowroot/admin.json
deleted file mode 100644
index c75c59d555..0000000000
--- a/server/apps/postgres-app/src/main/glowroot/admin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "web": {
- "bindAddress": "0.0.0.0"
- }
-}
\ No newline at end of file
diff --git a/server/apps/postgres-app/src/main/glowroot/plugins/imap.json
b/server/apps/postgres-app/src/main/glowroot/plugins/imap.json
deleted file mode 100644
index d27904feb5..0000000000
--- a/server/apps/postgres-app/src/main/glowroot/plugins/imap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "IMAP Plugin",
- "id": "imap",
- "instrumentation": [
- {
- "className":
"org.apache.james.imap.processor.base.AbstractChainedProcessor",
- "methodName": "doProcess",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "IMAP",
- "transactionNameTemplate": "IMAP processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "imapProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/postgres-app/src/main/glowroot/plugins/jmap.json
b/server/apps/postgres-app/src/main/glowroot/plugins/jmap.json
deleted file mode 100644
index 9afce4bf94..0000000000
--- a/server/apps/postgres-app/src/main/glowroot/plugins/jmap.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "JMAP Plugin",
- "id": "jmap",
- "instrumentation": [
- {
- "className": "org.apache.james.jmap.draft.methods.Method",
- "methodName": "processToStream",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "JMAP",
- "transactionNameTemplate": "JMAP method : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "jmapMethod"
- }
- ]
-}
\ No newline at end of file
diff --git
a/server/apps/postgres-app/src/main/glowroot/plugins/mailboxListener.json
b/server/apps/postgres-app/src/main/glowroot/plugins/mailboxListener.json
deleted file mode 100644
index 54a55ac1e4..0000000000
--- a/server/apps/postgres-app/src/main/glowroot/plugins/mailboxListener.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "MailboxListener Plugin",
- "id": "mailboxListener",
- "instrumentation": [
- {
- "className": "org.apache.james.mailbox.events.MailboxListener",
- "methodName": "event",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "MailboxListener",
- "transactionNameTemplate": "MailboxListener : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailboxListener"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/postgres-app/src/main/glowroot/plugins/pop3.json
b/server/apps/postgres-app/src/main/glowroot/plugins/pop3.json
deleted file mode 100644
index a5bcdccce1..0000000000
--- a/server/apps/postgres-app/src/main/glowroot/plugins/pop3.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "POP3 Plugin",
- "id": "pop3",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.pop3.core.AbstractPOP3CommandHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "POP3",
- "transactionNameTemplate": "POP3 Command: {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "pop3Timer"
- }
- ]
-}
diff --git a/server/apps/postgres-app/src/main/glowroot/plugins/smtp.json
b/server/apps/postgres-app/src/main/glowroot/plugins/smtp.json
deleted file mode 100644
index 393bac9d9c..0000000000
--- a/server/apps/postgres-app/src/main/glowroot/plugins/smtp.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "SMTP Plugin",
- "id": "smtp",
- "instrumentation": [
- {
- "className":
"org.apache.james.protocols.smtp.core.AbstractHookableCmdHandler",
- "methodName": "onCommand",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "SMTP",
- "transactionNameTemplate": "SMTP command : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "smtpProcessor"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/postgres-app/src/main/glowroot/plugins/spooler.json
b/server/apps/postgres-app/src/main/glowroot/plugins/spooler.json
deleted file mode 100644
index fd7732de8b..0000000000
--- a/server/apps/postgres-app/src/main/glowroot/plugins/spooler.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "name": "Spooler Plugin",
- "id": "spooler",
- "instrumentation": [
- {
- "className": "org.apache.james.mailetcontainer.api.MailProcessor",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Spooler",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailetProcessor"
- },
- {
- "className": "org.apache.mailet.Mailet",
- "methodName": "service",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Mailet",
- "transactionNameTemplate": "Mailet : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "mailet"
- },
- {
- "className": "org.apache.mailet.Matcher",
- "methodName": "match",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "Matcher",
- "transactionNameTemplate": "Mailet processor : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "matcher"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/postgres-app/src/main/glowroot/plugins/task.json
b/server/apps/postgres-app/src/main/glowroot/plugins/task.json
deleted file mode 100644
index 8f04c69e74..0000000000
--- a/server/apps/postgres-app/src/main/glowroot/plugins/task.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "Task Plugin",
- "id": "task",
- "instrumentation": [
- {
- "className": "org.apache.james.task.Task",
- "methodName": "run",
- "methodParameterTypes": [
- ".."
- ],
- "captureKind": "transaction",
- "transactionType": "TASK",
- "transactionNameTemplate": "TASK : {{this.class.name}}",
- "alreadyInTransactionBehavior": "capture-trace-entry",
- "traceEntryMessageTemplate": "{{this.class.name}}.{{methodName}}",
- "timerName": "task"
- }
- ]
-}
\ No newline at end of file
diff --git a/server/apps/scaling-pulsar-smtp/README.adoc
b/server/apps/scaling-pulsar-smtp/README.adoc
index c600ae6308..59d2b3d807 100644
--- a/server/apps/scaling-pulsar-smtp/README.adoc
+++ b/server/apps/scaling-pulsar-smtp/README.adoc
@@ -60,13 +60,6 @@ to pass extra JVM flags. For instance:
docker run -e "JAVA_TOOL_OPTIONS=-Xmx500m -Xms500m"
apache/james:scaling-pulsar-smtp-latest
----
-https://glowroot.org/[Glowroot APM] is packaged as part of the docker
distribution to easily enable valuable performances insights.
-Disabled by default, its java agent can easily be enabled:
-
-----
-docker run -e "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:scaling-pulsar-smtp-latest
-----
-
The https://james.apache.org/server/manage-cli.html[CLI] can easily be used:
----
diff --git a/server/apps/scaling-pulsar-smtp/pom.xml
b/server/apps/scaling-pulsar-smtp/pom.xml
index 24062ba0d4..93e66eb70e 100644
--- a/server/apps/scaling-pulsar-smtp/pom.xml
+++ b/server/apps/scaling-pulsar-smtp/pom.xml
@@ -253,25 +253,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-glowroot</id>
- <goals>
- <goal>wget</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<url>https://github.com/glowroot/glowroot/releases/download/v0.13.6/glowroot-0.13.6-dist.zip</url>
- <unpack>true</unpack>
-
<outputDirectory>${project.build.directory}</outputDirectory>
- <md5>f9026dbab1fbade067ca549913802fcc</md5>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
@@ -305,8 +286,6 @@
<volume>/logs</volume>
<volume>/root/conf</volume>
<volume>/root/extensions-jars</volume>
- <volume>/root/glowroot/plugins</volume>
- <volume>/root/glowroot/data</volume>
</volumes>
</container>
<extraDirectories>
@@ -319,10 +298,6 @@
<from>src/main/scripts</from>
<into>/usr/bin</into>
</path>
- <path>
- <from>target/glowroot</from>
- <into>/root</into>
- </path>
<path>
<from>src/main/extensions-jars</from>
<into>/root/extensions-jars</into>
@@ -346,28 +321,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-glowroot-resources</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>package</phase>
- <configuration>
-
<outputDirectory>${basedir}/target/glowroot</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/glowroot</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/server/apps/scaling-pulsar-smtp/src/main/glowroot/.gitkeep
b/server/apps/scaling-pulsar-smtp/src/main/glowroot/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/server/container/guice/memory/README.md
b/server/container/guice/memory/README.md
index 66ba1876a1..b3d3bbdf2f 100644
--- a/server/container/guice/memory/README.md
+++ b/server/container/guice/memory/README.md
@@ -39,12 +39,6 @@ to pass extra JVM flags. For instance:
docker run -e "JAVA_TOOL_OPTIONS=-Xmx500m -Xms500m" apache/james:memory-latest
```
-[Glowroot APM](https://glowroot.org/) is packaged as part of the docker
distribution to easily enable valuable performances insights.
-Disabled by default, its java agent can easily be enabled:
-
-```
-docker run -e "JAVA_TOOL_OPTIONS=-javaagent:/root/glowroot.jar"
apache/james:memory-latest
-```
The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used:
```
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
