From 25f34c32c21fa0739cdbdc16426c9437da8dafbf Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Wed, 26 Apr 2017 16:53:22 -0500 Subject: [PATCH 01/13] SF-6621 - adding 'start' attribute to Trace annotation to support custom trace entry points. --- README.md | 13 ++++++++++++- src/main/java/com/stackify/apm/Trace.java | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6ae4868..da63fc7 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,10 @@ file (stackify-apm.json) to your application. name can be a `String` and can also include the variables `{{ClassName}}`, `{{MethodName}}` and `{{MethodParameters[#]}}` (where `#` is an `int` referencing the parameter index on the annotated method, index starts at 0). +#### Custom Trace Entry Point +Stackify by default generates traces from web-requests on [supported application servers](http://support.stackify.com/hc/en-us/articles/209709913-What-Java-Application-Containers-and-Frameworks-are-Supported-) +and non-web-requests from [supported frameworks](http://support.stackify.com/hc/en-us/articles/209709913-What-Java-Application-Containers-and-Frameworks-are-Supported-). +You can extend support by using `@Trace(start = true)` on a method; which will start a new trace. ``` import com.stackify.apm.Trace; @@ -44,6 +48,13 @@ import com.stackify.apm.Trace; @Trace public class ClassToBeInstrumented { + + @Trace(start = true) + public void methodToStartNewTrace() + { + ... + } + @Trace public void methodToBeInstrumented() { @@ -77,7 +88,7 @@ public class ClassToBeInstrumented ## License -Copyright 2016 Stackify, LLC. +Copyright 2017 Stackify, LLC. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/main/java/com/stackify/apm/Trace.java b/src/main/java/com/stackify/apm/Trace.java index 01af5e5..05edabe 100644 --- a/src/main/java/com/stackify/apm/Trace.java +++ b/src/main/java/com/stackify/apm/Trace.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Stackify + * Copyright 2017 Stackify * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,13 @@ * {@literal @}Trace * public class ClassToBeInstrumented * { + * + * {@literal @}Trace(start = true) + * public void methodToStartNewTrace() + * { + * ... + * } + * * {@literal @}Trace * public void methodToBeInstrumented() * { @@ -90,9 +97,10 @@ String trackedFunctionName() default ""; String category() default "Java"; - + String subcategory() default "Other"; - + boolean action() default false; - + + boolean start() default false; } From 79aada3ded846aea0e8b801b2ed391c909b5ac07 Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Thu, 6 Jul 2017 09:55:22 -0500 Subject: [PATCH 02/13] [maven-release-plugin] prepare release stackify-java-apm-annot-1.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96a4dad..b712afa 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.2-SNAPSHOT + 1.0.2 Stackify Java APM Annotations Stackify Java APM Annotations From 557825f5b19196d1fd1a487639d11483177e8560 Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Thu, 6 Jul 2017 09:57:19 -0500 Subject: [PATCH 03/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b712afa..8107680 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.2 + 1.0.3-SNAPSHOT Stackify Java APM Annotations Stackify Java APM Annotations From 04396c43981c704fe5998a06c7652566e50d2a0f Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Thu, 6 Jul 2017 14:22:56 -0500 Subject: [PATCH 04/13] [maven-release-plugin] prepare release stackify-java-apm-annot-1.0.3 --- pom.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8107680..6d98e6f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.3-SNAPSHOT + 1.0.3 Stackify Java APM Annotations Stackify Java APM Annotations @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.1 + 1.6 sign-artifacts @@ -191,6 +191,9 @@ sign + + ${gpg.keyname} + From 735efbe7db27ae82739a02900e605c4db40490b8 Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Thu, 6 Jul 2017 14:23:22 -0500 Subject: [PATCH 05/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d98e6f..b60e075 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.3 + 1.0.4-SNAPSHOT Stackify Java APM Annotations Stackify Java APM Annotations From bc5335f1a6db0d68927713ce8812ae5747a1fcb2 Mon Sep 17 00:00:00 2001 From: Eric Martin Date: Thu, 6 Jul 2017 20:14:24 +0000 Subject: [PATCH 06/13] [maven-release-plugin] prepare release stackify-java-apm-annot-1.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b60e075..3c189a6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.4-SNAPSHOT + 1.0.4 Stackify Java APM Annotations Stackify Java APM Annotations From 7b421d000cf2a15a790201f2fc3b72fe84c1e011 Mon Sep 17 00:00:00 2001 From: Eric Martin Date: Thu, 6 Jul 2017 20:14:30 +0000 Subject: [PATCH 07/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c189a6..d3b1728 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.4 + 1.0.5-SNAPSHOT Stackify Java APM Annotations Stackify Java APM Annotations From e7388051999afbb9c656ac5c4d925a455e1654c1 Mon Sep 17 00:00:00 2001 From: Eric Martin Date: Wed, 20 Dec 2017 11:37:54 -0600 Subject: [PATCH 08/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da63fc7..92555ba 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Stackify APM+ Overview: -http://support.stackify.com/hc/en-us/categories/200398749-APM- +http://support.stackify.com/agent-installation-overview/ Sign Up for a Trial: From 64b0d2a246196c788881c2672824a623241a494d Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Wed, 8 Aug 2018 10:46:51 -0500 Subject: [PATCH 09/13] [maven-release-plugin] prepare release stackify-java-apm-annot-1.0.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3b1728..5675543 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.5-SNAPSHOT + 1.0.5 Stackify Java APM Annotations Stackify Java APM Annotations From 61c05c783eed88bb6533888d6a37ada12c022a0b Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Wed, 8 Aug 2018 10:47:06 -0500 Subject: [PATCH 10/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5675543..e7849b8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.5 + 1.0.6-SNAPSHOT Stackify Java APM Annotations Stackify Java APM Annotations From 33eb350b1a520e5776a4ebefd386b3251fe3ec84 Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Wed, 8 Aug 2018 13:07:07 -0500 Subject: [PATCH 11/13] Adjusting RUM documentation. --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e9ca9bd..fa91d45 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,16 @@ Add it as a maven dependency: Real User Monitoring (RUM) manual instrumentation allows you to specify where the RUM JavaScript block is injected. -**Note**: Ensure that auto instrumentation is disabled by adding **rum.autoInstrument=false** to **stackify-api.properties** in your application's classpath. +It is recommended you provide a `stackify-api.properties` file in your application classpath with the following content: -Your application code will need to call out to the Stackify **getRUMJavaScriptBlock()** method in the `` section as detailed below: +```` +stackify.application=My Application Name +stackify.environment=My Environment Name +```` -#### JSP Example +Your application code will need to call out to the Stackify `com.stackify.apm.Stackify.getRUMJavaScriptBlock()` method in the `` section as detailed below: + +**JSP Example** ```` @@ -49,6 +54,7 @@ Your application code will need to call out to the Stackify **getRUMJavaScriptBl ```` + ### @Trace Annotation Add custom instrumentation to classes using the @Trace annotation. The annotation needs to be added to From b6e69e2e3a44388a868675a4a4c3afc6350aefb7 Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Wed, 8 Aug 2018 13:09:54 -0500 Subject: [PATCH 12/13] [maven-release-plugin] prepare release stackify-java-apm-annot-1.0.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7849b8..f52ea3e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.6-SNAPSHOT + 1.0.6 Stackify Java APM Annotations Stackify Java APM Annotations From 648d9920b34ed828c85aad58b595ff3dd2466db3 Mon Sep 17 00:00:00 2001 From: Darin Howard Date: Wed, 8 Aug 2018 13:10:09 -0500 Subject: [PATCH 13/13] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f52ea3e..b34bdc9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.stackify stackify-java-apm-annot - 1.0.6 + 1.0.7-SNAPSHOT Stackify Java APM Annotations Stackify Java APM Annotations