Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #308 from sergiotudela/bug/mac_jvm_attach | Diego Parra | 2016-01-21 | 1 | -12/+73 | |
|\ \ \ | | | | | | | | | = autoweave: BsdVirtualMachine is attached from AgentLoader properly | |||||
| * | | | Fixes https://github.com/kamon-io/Kamon/issues/307 | sergiotudela | 2016-01-21 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | - Clean comments. | |||||
| * | | | Fixes https://github.com/kamon-io/Kamon/issues/307 | sergiotudela | 2016-01-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | - Clean comments. | |||||
| * | | | Fixes https://github.com/kamon-io/Kamon/issues/307 | sergiotudela | 2016-01-21 | 1 | -3/+2 | |
| | | | | | | | | | | | | | | | | - Clean comments. | |||||
| * | | | Fixes https://github.com/kamon-io/Kamon/issues/307 | sergiotudela | 2016-01-21 | 1 | -12/+73 | |
| |/ / | ||||||
* | | | Merge pull request #306 from jcazevedo/trace-metric-filters | Ivan Topolnjak | 2016-01-21 | 1 | -2/+4 | |
|\ \ \ | |/ / |/| | | = core: apply metric filters to traces | |||||
| * | | = core: apply metric filters to traces | Joao Azevedo | 2016-01-20 | 1 | -2/+4 | |
|/ / | ||||||
* | | Merge pull request #302 from trobert/master | Diego Parra | 2016-01-08 | 1 | -1/+3 | |
|\ \ | | | | | | | = core: don't throw MathError when auto-start is disabled for a module #300 | |||||
| * | | = core: don't throw MathError when auto-start is disabled for a module #300 | Thibaut Robert | 2016-01-08 | 1 | -1/+3 | |
|/ / | ||||||
* | | Merge pull request #294 from jozic/scale | Diego Parra | 2015-12-24 | 14 | -13/+477 | |
|\ \ | | | | | | | Scale | |||||
| * | | + core: provide generic way to scale time and memory metrics | Eugene Platonov | 2015-12-01 | 14 | -13/+477 | |
| | | | ||||||
* | | | = All: downgrade sbt to 0.13.8 in order to avoid issues with scalariform | Diego | 2015-12-17 | 4 | -34/+32 | |
| | | | ||||||
* | | | Merge pull request #296 from kamon-io/kamon-autoweave | Ivan Topolnjak | 2015-12-09 | 15 | -1/+2759 | |
|\ \ \ | |/ / |/| | | + kamon-autoweave: this new module allow attach the AspectJ loadtime … | |||||
| * | | + kamon-autoweave: this new module allow attach the AspectJ loadtime weaving ↵ | Diego | 2015-12-09 | 15 | -1/+2759 | |
| | | | | | | | | | | | | agent to a JVM after it has started (you don't need to use -javaagent). This offers extra flexibility but obviously any classes loaded before attachment will not be woven. | |||||
* | | | ! core: Avoid updating the totalCount on our histograms and close #293 | Diego | 2015-11-30 | 2 | -37/+16 | |
|/ / | ||||||
* / | = all: some clean up | Diego | 2015-11-27 | 1 | -1/+0 | |
|/ | ||||||
* | ! core: Decoupling basic apis from reporters in order to improve Kamon ↵ | Diego | 2015-11-25 | 4 | -17/+61 | |
| | | | | tooling for tests | |||||
* | Merge branch 'master' into wip/decoupling-basic-apis-from-reporters | Diego | 2015-11-25 | 0 | -0/+0 | |
|\ | ||||||
* | | wip: merge from master and fix some test | Diego | 2015-11-15 | 3 | -17/+8 | |
|\| | ||||||
| * | Merge pull request #270 from jozic/statsd-senders | Ivan Topolnjak | 2015-11-03 | 0 | -0/+0 | |
| |\ | | | | | | | ! statsd: allow custom statsd senders + add simple statsd sender which doesn't batch stats | |||||
| * \ | Merge pull request #264 from everpeace/add-kamon-fluentd | Diego Parra | 2015-10-29 | 0 | -0/+0 | |
| |\ \ | | |/ | |/| | Introducing Kamon Fluentd module. | |||||
| * | | Merge pull request #269 from cheekychops/logger | Ivan Topolnjak | 2015-10-28 | 0 | -0/+0 | |
| |\ \ | | |/ | |/| | = newrelic: Associate logged errors with correct transaction | |||||
| * | | Merge pull request #258 from Tolsi/stolmachev-kamon-jmx | Diego Parra | 2015-10-23 | 0 | -0/+0 | |
| |\ \ | | |/ | |/| | Kamon JMX was added | |||||
| * | | Merge pull request #263 from jozic/shutdown | Diego Parra | 2015-09-30 | 1 | -2/+4 | |
| |\ \ | | | | | | | | | = core: don't throw an NPE during shutdown if Kamon hasn't been started | |||||
| | * | | = core: don't throw an NPE during shutdown if Kamon hasn't been started | Eugene Platonov | 2015-09-30 | 1 | -2/+4 | |
| | |/ | ||||||
| * | | Merge pull request #256 from cheekychops/master | Diego Parra | 2015-09-30 | 0 | -0/+0 | |
| |\| | | | | | | | newrelic: de-tokenise the app name, fixes #255 | |||||
| * | | Merge pull request #262 from jozic/patch-1 | Diego Parra | 2015-09-30 | 1 | -1/+1 | |
| |\ \ | | |/ | |/| | = core: fix typo in kamon auto-start error message | |||||
| | * | = core: fix typo in kamon auto-start error message | Eugene Platonov | 2015-09-30 | 1 | -1/+1 | |
| |/ | ||||||
| * | = akka-remote: add @transient to kamon.trace.SegmentAware::segment to avoid ↵ | Diego | 2015-08-27 | 1 | -1/+1 | |
| | | | | | | | | error in chill/kryo serialization and closes #160 | |||||
* | | wip, core/akka/spray are kind of migrated. | Ivan Topolnjak | 2015-08-28 | 11 | -144/+73 | |
|/ | ||||||
* | ! kamon-akka: change in DispatcherInstrumentation the type of Dispatcher to ↵ | Diego | 2015-08-25 | 1 | -5/+5 | |
| | | | | ForkJoinPool instead of AkkaForkJoinPool | |||||
* | ! core: generalize ThreadPoolExecutors metrics | Diego | 2015-08-25 | 3 | -58/+278 | |
| | ||||||
* | Merge pull request #245 from tferi/generic-mem-metrics | Ivan Topolnjak | 2015-08-25 | 2 | -1/+92 | |
|\ | | | | | = Generic mem metrics | |||||
| * | ! core: generalize ThreadPoolExecutors metrics | Diego | 2015-08-25 | 2 | -1/+92 | |
|/ | ||||||
* | Merge branch 'make-kamon-test-friendly' | Ivan Topolnjak | 2015-08-24 | 1 | -2/+20 | |
|\ | | | | | | | | | | | Conflicts: kamon-core/src/main/scala/kamon/Kamon.scala project/Settings.scala | |||||
| * | + core: introduce auto-start feature to make Kamon more test-friendly, ↵ | Ivan Topolnjak | 2015-08-24 | 2 | -3/+21 | |
| | | | | | | | | related to #202. | |||||
* | | ! play: remove diagnostic context data | Diego | 2015-08-16 | 1 | -4/+0 | |
| | | ||||||
* | | Merge pull request #241 from sematext/added_spm_backend | Diego Parra | 2015-08-12 | 0 | -0/+0 | |
|\ \ | | | | | | | + add spm metric backend | |||||
* | | | = system-metrics: The sigar not implemented exceptions are listed as ↵ | Diego | 2015-08-11 | 1 | -1/+1 | |
|/ / | | | | | | | warnings. closes #235 | |||||
* | | Merge pull request #236 from sattvik/counters-with-units | Ivan Topolnjak | 2015-07-27 | 1 | -0/+3 | |
|\ \ | | | | | | | + core: Allow creation of counters with units | |||||
| * | | + core: Allow creation of counters with units | Daniel Solano Gómez | 2015-07-24 | 1 | -0/+3 | |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the GenericEntityRecorder only allows two ways to create a new counter: 1. Using a simple name, resulting in a counter with an Unknown unit of measure 2. Using a CounterKey, but that is not really helpful since that class is private to Kamon This trivial patch adds a new counter method that accepts a unit of measure. | |||||
* | | Merge branch 'pr/elyrixia-samplers-206' | Ivan Topolnjak | 2015-07-21 | 6 | -25/+124 | |
|\ \ | ||||||
| * | | Merge branch 'samplers' of https://github.com/Elyrixia/Kamon into ↵ | Ivan Topolnjak | 2015-07-21 | 6 | -25/+124 | |
|/| | | | | | | | | | | | pr/elyrixia-samplers-206 | |||||
| * | | + core: add a clock-sampler, fix ordered-sampler, add unit tests for samplers | Tristan Sallé | 2015-07-15 | 6 | -25/+124 | |
| |/ | ||||||
* / | + Ensure that the TraceLocalStorage can be used from Java and close #196 | Diego | 2015-07-18 | 2 | -13/+33 | |
|/ | ||||||
* | Merge pull request #231 from cheekychops/cheekychops-patch-1 | Ivan Topolnjak | 2015-07-14 | 0 | -0/+0 | |
|\ | | | | | build: Remove compile dependency from kamon-newrelic to kamon-testkit | |||||
* \ | Merge pull request #223 from jtjeferreira/customTraceTokenGenerator | Ivan Topolnjak | 2015-07-14 | 4 | -11/+24 | |
|\ \ | |/ |/| | + core: kamon.trace.token-generator conf | |||||
| * | + core: kamon.trace.token-generator conf | João Ferreira | 2015-06-26 | 4 | -11/+24 | |
| | | ||||||
* | | Merge pull request #230 from jozic/fix-config-doc | Ivan Topolnjak | 2015-07-10 | 0 | -0/+0 | |
|\| | | | | | = datadog,statsd: fix config docs | |||||
* | | Merge pull request #228 from slavaschmidt/newrelic-custom-akka-metrics-2 | Ivan Topolnjak | 2015-07-10 | 0 | -0/+0 | |
|\| | | | | | + newrelic: add possibility to send akka metrics to the newrelic |