Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 4 | -6/+26 |
| | | | | | | | | related to #202. | ||||
* | | Merge pull request #244 from tferi/mempool-metrics | Diego Parra | 2015-08-23 | 2 | -0/+81 |
|\ \ | | | | | | | + Add memory pool metrics | ||||
| * | | + system-metrics: Add memory pool metrics | Ferenc Toth | 2015-08-23 | 2 | -0/+81 |
| | | | |||||
* | | | = play: use uri.getAuthority forn generateHttpClientSegmentName | Diego | 2015-08-22 | 3 | -3/+3 |
|/ / | |||||
* | | ! build: revert Java version to 1.6 | Ivan Topolnjak | 2015-08-18 | 1 | -1/+1 |
| | | |||||
* | | ! build: rever typesafeconfig version to 1.2.1 | Ivan Topolnjak | 2015-08-18 | 1 | -1/+1 |
| | | |||||
* | | Setting version to 0.5.1-SNAPSHOT | Ivan Topolnjak | 2015-08-17 | 2 | -2/+2 |
| | | |||||
* | | Setting version to 0.5.0v0.5.0 | Ivan Topolnjak | 2015-08-16 | 2 | -2/+2 |
| | | |||||
* | | = All: force tests to run sequentially | Diego | 2015-08-16 | 1 | -7/+7 |
| | | |||||
* | | ! kamon-examples: update play examples before release | Diego | 2015-08-16 | 6 | -29/+12 |
| | | |||||
* | | ! play: remove diagnostic context data | Diego | 2015-08-16 | 7 | -75/+8 |
| | | |||||
* | | Merge pull request #241 from sematext/added_spm_backend | Diego Parra | 2015-08-12 | 7 | -1/+438 |
|\ \ | | | | | | | + add spm metric backend | ||||
| * | | + add spm metric backend | Pavel Zalunin | 2015-08-11 | 7 | -1/+438 |
| | | | |||||
* | | | = all: update Sigar-Loader and HdrHistogram versions | Diego | 2015-08-12 | 1 | -2/+2 |
| | | | |||||
* | | | = system-metrics: The sigar not implemented exceptions are listed as ↵ | Diego | 2015-08-11 | 22 | -62/+115 |
|/ / | | | | | | | warnings. closes #235 | ||||
* | | + system-metrics: Allow disabling of system sigar and JVM JMX metrics in ↵ | Diego | 2015-08-10 | 2 | -8/+20 |
| | | | | | | | | system-metrics module and closes #234 | ||||
* | | ! play-2.3.x: grouping traces that doesn't are tagged as UntaggedTraces in ↵ | Diego | 2015-08-10 | 4 | -8/+37 |
| | | | | | | | | order to avoid the creation of undesired traces | ||||
* | | ! play-2.4.x: grouping traces that doesn't are tagged as UntaggedTraces in ↵ | Diego | 2015-08-10 | 3 | -4/+32 |
| | | | | | | | | order to avoid the creation of undesired traces | ||||
* | | = build: add scala 2.10.5 | Ivan Topolnjak | 2015-08-09 | 1 | -1/+1 |
| | | |||||
* | | = play-2.4.x: fix test | Diego | 2015-08-09 | 1 | -3/+1 |
| | | |||||
* | | + play: play-2.4.x support | Diego | 2015-08-09 | 32 | -21/+23 |
| | | |||||
* | | = play-2.4: dependency resolved | Diego | 2015-08-09 | 7 | -43/+38 |
| | | |||||
* | | ! play: starting play 2.4.x integration | Diego | 2015-08-09 | 16 | -56/+75 |
| | | |||||
* | | ! play: first step in play 2.4.x integration | Diego | 2015-08-09 | 18 | -14/+939 |
| | | |||||
* | | + kamon-examples: include kamon-scalatra-example | Diego | 2015-07-30 | 11 | -0/+304 |
| | | |||||
* | | = akka: correctly set LookupData for routers used by BalancingPool, fixes #199. | Ivan Topolnjak | 2015-07-29 | 2 | -2/+28 |
| | | |||||
* | | + travis: move to container-based build environment. | Ivan Topolnjak | 2015-07-27 | 1 | -1/+2 |
| | | |||||
* | | 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. | ||||
* | | = system-metrics: update sigar-loader to 1.6.6 in order to avoid the ↵ | Diego | 2015-07-21 | 1 | -1/+1 |
| | | | | | | | | SigarException in the first provisioning | ||||
* | | 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 |
| | | | |||||
* | | | = build: restore the git commit SHA suffix on snapshot builds. | Ivan Topolnjak | 2015-07-21 | 2 | -2/+3 |
| | | | |||||
* | | | = kamon-examples: fix logger.xml and update copyright | Diego | 2015-07-20 | 4 | -4/+4 |
| | | | |||||
* | | | + kamon-examples: update play 2.3.x example to kamon 0.4.0 | Diego | 2015-07-20 | 8 | -15/+34 |
| | | | |||||
* | | | + play-examples: new play 2.4.x example | Diego | 2015-07-19 | 17 | -65/+53 |
| | | | |||||
* | | | + play-examples: new play 2.4.x example | Diego | 2015-07-18 | 16 | -0/+6492 |
| | | | |||||
* | | | + Ensure that the TraceLocalStorage can be used from Java and close #196 | Diego | 2015-07-18 | 3 | -16/+34 |
| |/ |/| | |||||
* | | = akka: minor formatting fixes. | Ivan Topolnjak | 2015-07-17 | 1 | -6/+4 |
|/ | |||||
* | Merge pull request #231 from cheekychops/cheekychops-patch-1 | Ivan Topolnjak | 2015-07-14 | 1 | -2/+2 |
|\ | | | | | build: Remove compile dependency from kamon-newrelic to kamon-testkit | ||||
| * | build: Remove compile dependency from kamon-newrelic to kamon-testkit | cheekychops | 2015-07-14 | 1 | -2/+2 |
| | | |||||
* | | 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 | 2 | -2/+2 |
|\ \ | | | | | | | = datadog,statsd: fix config docs | ||||
| * | | = datadog,statsd: fix config docs | Eugene Platonov | 2015-07-09 | 2 | -2/+2 |
| |/ | |||||
* | | Merge pull request #228 from slavaschmidt/newrelic-custom-akka-metrics-2 | Ivan Topolnjak | 2015-07-10 | 6 | -31/+210 |
|\ \ | | | | | | | + newrelic: add possibility to send akka metrics to the newrelic | ||||
| * | | + newrelic: add possibility to send akka metrics to the newrelic | Slava Schmidt | 2015-07-08 | 6 | -31/+210 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added possibility to send akka metrics to the newrelic as custom metrics. Externalized categories of newrelic subscription into the configuration file. This allow to define which metrics categories should be send to newrelic independent upon which metrics are actually collected. Akka metrics exported to the newrelic as custom metrics and available in custom dashboards in some format similar to: Cusom/akka-actor/{ActorSystemName[user|system|...]\{ActorName}/{MetricName} for actors and Custom/akka-thread-pool-executor\Some-Service\akka.io.pinned-dispatcher/ProcessedTasks for thread pools. Same metrics for multiple actors can be displayed as a single chart by using * (star) for part of the actor name. For example Cusom/akka-actor\MyActor\user\*DatabaseWorker/ProcessingTime will show processing time for all database workers. Example of actor metrics displayed by newrelic: http://s4.postimg.org/sfn9vjzgt/Screen_Shot_2015_04_22_at_11_24_15.png Example of pool metrics displayed by newrelic: http://s4.postimg.org/gchy7zoel/Screen_Shot_2015_04_22_at_11_24_24.png | ||||
* | | Merge pull request #229 from nilsga/master | Ivan Topolnjak | 2015-07-10 | 1 | -2/+5 |
|\ \ | |/ |/| | ! core: cleanup entity on removal |