This is an automated email from the ASF dual-hosted git repository. chibenwa pushed a commit to branch 3.9.x in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 54929126cd8e6a0c0f7f0b0ea99a17df54cbe4d0 Author: Benoit TELLIER <[email protected]> AuthorDate: Wed Sep 16 09:30:09 2026 +0200 Drop glowroot integration (backport) --- .gitignore | 1 - .../servers/pages/distributed/run/k8s-values.adoc | 3 -- .../servers/pages/distributed/run/run-docker.adoc | 13 ------ .../servers/pages/postgres/run/run-docker.adoc | 13 ------ pom.xml | 5 --- server/apps/cassandra-app/README.adoc | 9 ---- server/apps/cassandra-app/pom.xml | 49 ---------------------- .../cassandra-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-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 --- 82 files changed, 1 insertion(+), 1690 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/run/k8s-values.adoc b/docs/modules/servers/pages/distributed/run/k8s-values.adoc index 37b08258a0..0f4c76987b 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 66043ea2de..5abe595eda 100644 --- a/docs/modules/servers/pages/distributed/run/run-docker.adoc +++ b/docs/modules/servers/pages/distributed/run/run-docker.adoc @@ -104,19 +104,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/postgres/run/run-docker.adoc b/docs/modules/servers/pages/postgres/run/run-docker.adoc index bd56b4f144..c63915d22c 100644 --- a/docs/modules/servers/pages/postgres/run/run-docker.adoc +++ b/docs/modules/servers/pages/postgres/run/run-docker.adoc @@ -117,19 +117,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 c29d652c19..e86e9be5d0 100644 --- a/pom.xml +++ b/pom.xml @@ -3158,11 +3158,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/cassandra-app/README.adoc b/server/apps/cassandra-app/README.adoc index 353148e0d2..3ec63ea4e2 100644 --- a/server/apps/cassandra-app/README.adoc +++ b/server/apps/cassandra-app/README.adoc @@ -88,15 +88,6 @@ to pass extra JVM flags. For instance: docker run --network james -e "JAVA_TOOL_OPTIONS=-Xmx500m -Xms500m" apache/james:cassandra-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:cassandra-latest ----- - The [CLI](https://james.apache.org/server/manage-cli.html) can easily be used: diff --git a/server/apps/cassandra-app/pom.xml b/server/apps/cassandra-app/pom.xml index 6f425b2eda..614bfc77db 100644 --- a/server/apps/cassandra-app/pom.xml +++ b/server/apps/cassandra-app/pom.xml @@ -285,47 +285,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> @@ -364,8 +323,6 @@ <!-- SMTP + STARTTLS --> <port>587</port> <!-- SMTPS --> - <port>4000</port> - <!-- GLOWROOT, if activated --> <port>8000</port> <!-- WEBADMIN --> </ports> @@ -385,8 +342,6 @@ <volume>/root/extensions-jars</volume> <!-- Data for ActiveMQ mailQueue --> <volume>/root/var</volume> - <volume>/root/glowroot/plugins</volume> - <volume>/root/glowroot/data</volume> </volumes> </container> <extraDirectories> @@ -403,10 +358,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/cassandra-app/src/main/glowroot/admin.json b/server/apps/cassandra-app/src/main/glowroot/admin.json deleted file mode 100644 index c75c59d555..0000000000 --- a/server/apps/cassandra-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/cassandra-app/src/main/glowroot/plugins/blobstore.json b/server/apps/cassandra-app/src/main/glowroot/plugins/blobstore.json deleted file mode 100644 index 84291c6e16..0000000000 --- a/server/apps/cassandra-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/cassandra-app/src/main/glowroot/plugins/imap.json b/server/apps/cassandra-app/src/main/glowroot/plugins/imap.json deleted file mode 100644 index d27904feb5..0000000000 --- a/server/apps/cassandra-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/cassandra-app/src/main/glowroot/plugins/jmap.json b/server/apps/cassandra-app/src/main/glowroot/plugins/jmap.json deleted file mode 100644 index 79d6caeac4..0000000000 --- a/server/apps/cassandra-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/cassandra-app/src/main/glowroot/plugins/mailboxListener.json b/server/apps/cassandra-app/src/main/glowroot/plugins/mailboxListener.json deleted file mode 100644 index 54a55ac1e4..0000000000 --- a/server/apps/cassandra-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/cassandra-app/src/main/glowroot/plugins/pop3.json b/server/apps/cassandra-app/src/main/glowroot/plugins/pop3.json deleted file mode 100644 index a5bcdccce1..0000000000 --- a/server/apps/cassandra-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/cassandra-app/src/main/glowroot/plugins/smtp.json b/server/apps/cassandra-app/src/main/glowroot/plugins/smtp.json deleted file mode 100644 index 393bac9d9c..0000000000 --- a/server/apps/cassandra-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/cassandra-app/src/main/glowroot/plugins/spooler.json b/server/apps/cassandra-app/src/main/glowroot/plugins/spooler.json deleted file mode 100644 index 5937ca5dbc..0000000000 --- a/server/apps/cassandra-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/cassandra-app/src/main/glowroot/plugins/task.json b/server/apps/cassandra-app/src/main/glowroot/plugins/task.json deleted file mode 100644 index 8f04c69e74..0000000000 --- a/server/apps/cassandra-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-app/README.adoc b/server/apps/distributed-app/README.adoc index 1684f883bd..a6210ab57f 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 34a9bb4e6a..4317959efb 100644 --- a/server/apps/distributed-app/pom.xml +++ b/server/apps/distributed-app/pom.xml @@ -361,47 +361,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> @@ -430,8 +389,6 @@ <!-- SMTP + STARTTLS --> <port>587</port> <!-- SMTPS --> - <port>4000</port> - <!-- GLOWROOT, if activated --> <port>8000</port> <!-- WEBADMIN --> </ports> @@ -448,8 +405,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> @@ -466,10 +421,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 fd6307e600..a25760fba5 100644 --- a/server/apps/distributed-pop3-app/pom.xml +++ b/server/apps/distributed-pop3-app/pom.xml @@ -342,47 +342,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> @@ -422,8 +381,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> @@ -440,10 +397,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 746152709f..c169ed9ff4 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 e656823543..c42267b9a8 100644 --- a/server/apps/jpa-app/pom.xml +++ b/server/apps/jpa-app/pom.xml @@ -230,47 +230,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> @@ -299,8 +258,6 @@ <!-- SMTP + STARTTLS --> <port>587</port> <!-- SMTPS --> - <port>4000</port> - <!-- GLOWROOT, if activated --> <port>8000</port> <!-- WEBADMIN --> </ports> @@ -317,8 +274,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 derby database --> @@ -340,10 +295,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 4264d97efd..b4cb6f323b 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 9751dbf52c..08c0679ee5 100644 --- a/server/apps/jpa-smtp-app/pom.xml +++ b/server/apps/jpa-smtp-app/pom.xml @@ -196,47 +196,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> @@ -278,8 +237,6 @@ <!-- SMTP + STARTTLS --> <port>587</port> <!-- SMTPS --> - <port>4000</port> - <!-- GLOWROOT, if activated --> <port>8000</port> <!-- WEBADMIN --> </ports> @@ -299,8 +256,6 @@ <volume>/root/var</volume> <!-- Data for derby 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> @@ -319,10 +274,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 f0e03a24b4..9073d1df1f 100644 --- a/server/apps/memory-app/pom.xml +++ b/server/apps/memory-app/pom.xml @@ -231,47 +231,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> @@ -300,8 +259,6 @@ <!-- SMTP + STARTTLS --> <port>587</port> <!-- SMTPS --> - <port>4000</port> - <!-- GLOWROOT, if activated --> <port>8000</port> <!-- WEBADMIN --> </ports> @@ -317,8 +274,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> @@ -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/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 6394e4e435..2044d4091b 100644 --- a/server/apps/postgres-app/pom.xml +++ b/server/apps/postgres-app/pom.xml @@ -301,47 +301,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> @@ -370,8 +329,6 @@ <!-- SMTP + STARTTLS --> <port>587</port> <!-- SMTPS --> - <port>4000</port> - <!-- GLOWROOT, if activated --> <port>8000</port> <!-- WEBADMIN --> </ports> @@ -388,8 +345,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> @@ -408,10 +363,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 600d4a9360..5dbe288e5f 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]
