aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into wip/decoupling-basic-apis-from-reportersDiego2015-11-253-3/+42
|\
| * ! build: filter most of the output from sbt test.Ivan Topolnjak2015-11-233-3/+42
* | wip: merge from master and fix some testDiego2015-11-1564-243/+2092
|\|
| * Merge pull request #280 from jozic/spm-fIvan Topolnjak2015-11-052-4/+4
| |\
| | * = spm: fix sending metrics failure messageEugene Platonov2015-11-052-4/+4
| |/
| * Merge pull request #279 from cheekychops/loggerbugDiego Parra2015-11-043-16/+204
| |\
| | * = newrelic: prevent NPE when errors are logged without New Relic AgentColin Smith2015-11-043-16/+204
| |/
| * Merge pull request #270 from jozic/statsd-sendersIvan Topolnjak2015-11-0312-232/+519
| |\
| | * ! statsd: allow custom statsd senders + add simple statsd sender which doesn'...Eugene Platonov2015-10-2812-232/+519
| * | Merge pull request #264 from everpeace/add-kamon-fluentdDiego Parra2015-10-2911-1/+747
| |\ \
| | * | + add Fluentd moduleShingo Omura2015-10-2511-1/+747
| * | | + kamon-examples: include kamon-annotation examplesDiego2015-10-2912-0/+197
| * | | Merge pull request #276 from cheekychops/sbt0139Diego Parra2015-10-281-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | = build: upgrade to sbt 0.13.9Colin Smith2015-10-281-1/+1
| |/ /
| * | Merge pull request #269 from cheekychops/loggerIvan Topolnjak2015-10-284-21/+36
| |\ \ | | |/ | |/|
| | * = newrelic: Associate logged errors with correct transactionColin Smith2015-10-144-21/+36
| * | Merge pull request #258 from Tolsi/stolmachev-kamon-jmxDiego Parra2015-10-235-2/+333
| |\ \
| | * | + add jmx metric reporterSergey Tolmachev2015-10-225-2/+333
| * | | Merge pull request #268 from cheekychops/sslDiego Parra2015-10-217-19/+29
| |\ \ \ | | |_|/ | |/| |
| | * | + newrelic: add ssl support to agentColin Smith2015-10-097-19/+29
| |/ /
| * | + system-metrics: add open file descriptors metrics.Ivan Topolnjak2015-10-062-1/+22
| * | Setting version to 0.5.3-SNAPSHOTIvan Topolnjak2015-10-062-2/+2
| * | Setting version to 0.5.2v0.5.2Ivan Topolnjak2015-10-062-2/+2
| * | Merge pull request #263 from jozic/shutdownDiego Parra2015-09-301-2/+4
| |\ \
| | * | = core: don't throw an NPE during shutdown if Kamon hasn't been startedEugene Platonov2015-09-301-2/+4
| * | | Merge pull request #256 from cheekychops/masterDiego Parra2015-09-302-3/+45
| |\ \ \
| | * | | newrelic: de-tokenise the app name, fixes #255Colin Smith2015-09-142-3/+45
| | | |/ | | |/|
| * | | Merge pull request #262 from jozic/patch-1Diego Parra2015-09-301-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | = core: fix typo in kamon auto-start error messageEugene Platonov2015-09-301-1/+1
| |/ /
| * | = all: bump up all versionDiego2015-09-261-5/+5
| * | Merge pull request #260 from alno/heap-metrics-fixDiego Parra2015-09-262-8/+22
| |\ \ | | |/ | |/|
| | * ! system-metrics: Fix heap metrics updateAlexey Noskov2015-09-262-8/+22
| |/
| * = newrelic: correctly filter non-http-client segments from the web transactio...Ivan Topolnjak2015-09-011-2/+5
| * Setting version to 0.5.2-SNAPSHOTIvan Topolnjak2015-08-312-2/+2
| * Setting version to 0.5.1v0.5.1Ivan Topolnjak2015-08-312-2/+2
| * = akka-remote: add @transient to kamon.trace.SegmentAware::segment to avoid e...Diego2015-08-271-1/+1
* | wip: only the modules that actually require an actor system are getting one.Ivan Topolnjak2015-08-3034-196/+133
* | wip, core/akka/spray are kind of migrated.Ivan Topolnjak2015-08-2835-406/+245
|/
* ! kamon-akka: change in DispatcherInstrumentation the type of Dispatcher to F...Diego2015-08-252-8/+9
* ! core: generalize ThreadPoolExecutors metricsDiego2015-08-255-104/+287
* Merge pull request #245 from tferi/generic-mem-metricsIvan Topolnjak2015-08-2512-169/+138
|\
| * = system-metrics: Generic mem metricsFerenc Toth2015-08-255-135/+32
| * ! core: generalize ThreadPoolExecutors metricsDiego2015-08-257-34/+106
|/
* Merge branch 'make-kamon-test-friendly'Ivan Topolnjak2015-08-241-2/+20
|\
| * + core: introduce auto-start feature to make Kamon more test-friendly, relate...Ivan Topolnjak2015-08-244-6/+26
* | Merge pull request #244 from tferi/mempool-metricsDiego Parra2015-08-232-0/+81
|\ \
| * | + system-metrics: Add memory pool metricsFerenc Toth2015-08-232-0/+81
* | | = play: use uri.getAuthority forn generateHttpClientSegmentNameDiego2015-08-223-3/+3
|/ /
* | ! build: revert Java version to 1.6Ivan Topolnjak2015-08-181-1/+1
* | ! build: rever typesafeconfig version to 1.2.1Ivan Topolnjak2015-08-181-1/+1