aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'make-kamon-test-friendly'Ivan Topolnjak2015-08-241-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 Topolnjak2015-08-244-6/+26
| | | | | | | | related to #202.
* | Merge pull request #244 from tferi/mempool-metricsDiego Parra2015-08-232-0/+81
|\ \ | | | | | | + Add memory pool metrics
| * | + 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
| |
* | Setting version to 0.5.1-SNAPSHOTIvan Topolnjak2015-08-172-2/+2
| |
* | Setting version to 0.5.0v0.5.0Ivan Topolnjak2015-08-162-2/+2
| |
* | = All: force tests to run sequentiallyDiego2015-08-161-7/+7
| |
* | ! kamon-examples: update play examples before releaseDiego2015-08-166-29/+12
| |
* | ! play: remove diagnostic context dataDiego2015-08-167-75/+8
| |
* | Merge pull request #241 from sematext/added_spm_backendDiego Parra2015-08-127-1/+438
|\ \ | | | | | | + add spm metric backend
| * | + add spm metric backendPavel Zalunin2015-08-117-1/+438
| | |
* | | = all: update Sigar-Loader and HdrHistogram versionsDiego2015-08-121-2/+2
| | |
* | | = system-metrics: The sigar not implemented exceptions are listed as ↵Diego2015-08-1122-62/+115
|/ / | | | | | | warnings. closes #235
* | + system-metrics: Allow disabling of system sigar and JVM JMX metrics in ↵Diego2015-08-102-8/+20
| | | | | | | | system-metrics module and closes #234
* | ! play-2.3.x: grouping traces that doesn't are tagged as UntaggedTraces in ↵Diego2015-08-104-8/+37
| | | | | | | | order to avoid the creation of undesired traces
* | ! play-2.4.x: grouping traces that doesn't are tagged as UntaggedTraces in ↵Diego2015-08-103-4/+32
| | | | | | | | order to avoid the creation of undesired traces
* | = build: add scala 2.10.5Ivan Topolnjak2015-08-091-1/+1
| |
* | = play-2.4.x: fix testDiego2015-08-091-3/+1
| |
* | + play: play-2.4.x supportDiego2015-08-0932-21/+23
| |
* | = play-2.4: dependency resolvedDiego2015-08-097-43/+38
| |
* | ! play: starting play 2.4.x integrationDiego2015-08-0916-56/+75
| |
* | ! play: first step in play 2.4.x integrationDiego2015-08-0918-14/+939
| |
* | + kamon-examples: include kamon-scalatra-exampleDiego2015-07-3011-0/+304
| |
* | = akka: correctly set LookupData for routers used by BalancingPool, fixes #199.Ivan Topolnjak2015-07-292-2/+28
| |
* | + travis: move to container-based build environment.Ivan Topolnjak2015-07-271-1/+2
| |
* | Merge pull request #236 from sattvik/counters-with-unitsIvan Topolnjak2015-07-271-0/+3
|\ \ | | | | | | + core: Allow creation of counters with units
| * | + core: Allow creation of counters with unitsDaniel Solano Gómez2015-07-241-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 ↵Diego2015-07-211-1/+1
| | | | | | | | SigarException in the first provisioning
* | Merge branch 'pr/elyrixia-samplers-206'Ivan Topolnjak2015-07-216-25/+124
|\ \
| * | Merge branch 'samplers' of https://github.com/Elyrixia/Kamon into ↵Ivan Topolnjak2015-07-216-25/+124
|/| | | | | | | | | | | pr/elyrixia-samplers-206
| * | + core: add a clock-sampler, fix ordered-sampler, add unit tests for samplersTristan Sallé2015-07-156-25/+124
| | |
* | | = build: restore the git commit SHA suffix on snapshot builds.Ivan Topolnjak2015-07-212-2/+3
| | |
* | | = kamon-examples: fix logger.xml and update copyrightDiego2015-07-204-4/+4
| | |
* | | + kamon-examples: update play 2.3.x example to kamon 0.4.0Diego2015-07-208-15/+34
| | |
* | | + play-examples: new play 2.4.x exampleDiego2015-07-1917-65/+53
| | |
* | | + play-examples: new play 2.4.x exampleDiego2015-07-1816-0/+6492
| | |
* | | + Ensure that the TraceLocalStorage can be used from Java and close #196Diego2015-07-183-16/+34
| |/ |/|
* | = akka: minor formatting fixes.Ivan Topolnjak2015-07-171-6/+4
|/
* Merge pull request #231 from cheekychops/cheekychops-patch-1Ivan Topolnjak2015-07-141-2/+2
|\ | | | | build: Remove compile dependency from kamon-newrelic to kamon-testkit
| * build: Remove compile dependency from kamon-newrelic to kamon-testkitcheekychops2015-07-141-2/+2
| |
* | Merge pull request #223 from jtjeferreira/customTraceTokenGeneratorIvan Topolnjak2015-07-144-11/+24
|\ \ | |/ |/| + core: kamon.trace.token-generator conf
| * + core: kamon.trace.token-generator confJoão Ferreira2015-06-264-11/+24
| |
* | Merge pull request #230 from jozic/fix-config-docIvan Topolnjak2015-07-102-2/+2
|\ \ | | | | | | = datadog,statsd: fix config docs
| * | = datadog,statsd: fix config docsEugene Platonov2015-07-092-2/+2
| |/
* | Merge pull request #228 from slavaschmidt/newrelic-custom-akka-metrics-2Ivan Topolnjak2015-07-106-31/+210
|\ \ | | | | | | + newrelic: add possibility to send akka metrics to the newrelic
| * | + newrelic: add possibility to send akka metrics to the newrelicSlava Schmidt2015-07-086-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/masterIvan Topolnjak2015-07-101-2/+5
|\ \ | |/ |/| ! core: cleanup entity on removal