aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #308 from sergiotudela/bug/mac_jvm_attachDiego Parra2016-01-211-12/+73
|\ \ \
| * | | Fixes https://github.com/kamon-io/Kamon/issues/307sergiotudela2016-01-211-2/+3
| * | | Fixes https://github.com/kamon-io/Kamon/issues/307sergiotudela2016-01-211-1/+1
| * | | Fixes https://github.com/kamon-io/Kamon/issues/307sergiotudela2016-01-211-3/+2
| * | | Fixes https://github.com/kamon-io/Kamon/issues/307sergiotudela2016-01-211-12/+73
| |/ /
* | | Merge pull request #306 from jcazevedo/trace-metric-filtersIvan Topolnjak2016-01-211-2/+4
|\ \ \ | |/ / |/| |
| * | = core: apply metric filters to tracesJoao Azevedo2016-01-201-2/+4
|/ /
* | Merge pull request #302 from trobert/masterDiego Parra2016-01-081-1/+3
|\ \
| * | = core: don't throw MathError when auto-start is disabled for a module #300Thibaut Robert2016-01-081-1/+3
|/ /
* | Merge pull request #294 from jozic/scaleDiego Parra2015-12-2414-13/+477
|\ \
| * | + core: provide generic way to scale time and memory metricsEugene Platonov2015-12-0114-13/+477
* | | = All: downgrade sbt to 0.13.8 in order to avoid issues with scalariformDiego2015-12-174-34/+32
* | | Merge pull request #296 from kamon-io/kamon-autoweaveIvan Topolnjak2015-12-0915-1/+2759
|\ \ \ | |/ / |/| |
| * | + kamon-autoweave: this new module allow attach the AspectJ loadtime weaving ...Diego2015-12-0915-1/+2759
* | | ! core: Avoid updating the totalCount on our histograms and close #293Diego2015-11-302-37/+16
|/ /
* / = all: some clean upDiego2015-11-271-1/+0
|/
* ! core: Decoupling basic apis from reporters in order to improve Kamon toolin...Diego2015-11-254-17/+61
* Merge branch 'master' into wip/decoupling-basic-apis-from-reportersDiego2015-11-250-0/+0
|\
* | wip: merge from master and fix some testDiego2015-11-153-17/+8
|\|
| * Merge pull request #270 from jozic/statsd-sendersIvan Topolnjak2015-11-030-0/+0
| |\
| * \ Merge pull request #264 from everpeace/add-kamon-fluentdDiego Parra2015-10-290-0/+0
| |\ \ | | |/ | |/|
| * | Merge pull request #269 from cheekychops/loggerIvan Topolnjak2015-10-280-0/+0
| |\ \ | | |/ | |/|
| * | Merge pull request #258 from Tolsi/stolmachev-kamon-jmxDiego Parra2015-10-230-0/+0
| |\ \ | | |/ | |/|
| * | 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-300-0/+0
| |\|
| * | 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
| |/
| * = akka-remote: add @transient to kamon.trace.SegmentAware::segment to avoid e...Diego2015-08-271-1/+1
* | wip, core/akka/spray are kind of migrated.Ivan Topolnjak2015-08-2811-144/+73
|/
* ! kamon-akka: change in DispatcherInstrumentation the type of Dispatcher to F...Diego2015-08-251-5/+5
* ! core: generalize ThreadPoolExecutors metricsDiego2015-08-253-58/+278
* Merge pull request #245 from tferi/generic-mem-metricsIvan Topolnjak2015-08-252-1/+92
|\
| * ! core: generalize ThreadPoolExecutors metricsDiego2015-08-252-1/+92
|/
* 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-242-3/+21
* | ! play: remove diagnostic context dataDiego2015-08-161-4/+0
* | Merge pull request #241 from sematext/added_spm_backendDiego Parra2015-08-120-0/+0
|\ \
* | | = system-metrics: The sigar not implemented exceptions are listed as warnings...Diego2015-08-111-1/+1
|/ /
* | Merge pull request #236 from sattvik/counters-with-unitsIvan Topolnjak2015-07-271-0/+3
|\ \
| * | + core: Allow creation of counters with unitsDaniel Solano Gómez2015-07-241-0/+3
|/ /
* | Merge branch 'pr/elyrixia-samplers-206'Ivan Topolnjak2015-07-216-25/+124
|\ \
| * | Merge branch 'samplers' of https://github.com/Elyrixia/Kamon into pr/elyrixia...Ivan Topolnjak2015-07-216-25/+124
|/| |
| * | + core: add a clock-sampler, fix ordered-sampler, add unit tests for samplersTristan Sallé2015-07-156-25/+124
| |/
* / + Ensure that the TraceLocalStorage can be used from Java and close #196Diego2015-07-182-13/+33
|/
* Merge pull request #231 from cheekychops/cheekychops-patch-1Ivan Topolnjak2015-07-140-0/+0
|\
* \ Merge pull request #223 from jtjeferreira/customTraceTokenGeneratorIvan Topolnjak2015-07-144-11/+24
|\ \ | |/ |/|
| * + core: kamon.trace.token-generator confJoão Ferreira2015-06-264-11/+24
* | Merge pull request #230 from jozic/fix-config-docIvan Topolnjak2015-07-100-0/+0
|\|
* | Merge pull request #228 from slavaschmidt/newrelic-custom-akka-metrics-2Ivan Topolnjak2015-07-100-0/+0
|\|