Commit Graph

830 Commits

Author SHA1 Message Date
Fabian Reinartz 71b95dc48e Remove vendoring 2015-08-19 16:13:11 +02:00
Julius Volz 4a339dcbca Fix minor typos in comment. 2015-08-17 12:58:16 +02:00
Fabian Reinartz bbd006bc5e Merge pull request #162 from prometheus/fabxc/runtime-test
Turn allocation test into a benchmark.
2015-08-13 23:05:05 +02:00
Fabian Reinartz e6310b190e Turn allocation test into a benchmark. 2015-08-13 19:09:23 +02:00
Fabian Reinartz 762de31e01 Merge pull request #161 from prometheus/fabxc/runtime-test
Remove runtime-dependent test.
2015-08-13 18:49:01 +02:00
Fabian Reinartz 89773a6194 Remove runtime-dependent test.
Success of this test was runtime dependent and did not validate
the implementation logic itself.
2015-08-13 18:08:36 +02:00
William Kennedy f075821cbb Update histogram_test.go
These tests are always timing out in our Jenkins CI environment. We have moved our timeout to 2 minutes. I have added a check for the short flag so other can skip these tests as we are until this can be identified.
2015-08-12 17:51:21 -04:00
Fabian Reinartz dd33f764bd Merge pull request #158 from ardan-bkennedy/patch-1
Update go_collector_test.go
2015-08-12 22:22:03 +02:00
Fabian Reinartz fa8495136c Merge pull request #157 from prometheus/reserve-tmp
Reserve a label prefix for use for temporary relabeling.
2015-08-12 21:58:35 +02:00
William Kennedy a794f77b54 Update go_collector_test.go
We are running into a timeout with TestHistogramConcurrency on our Jenkins box. I noticed in the stack trace for the timeout this block.

goroutine 2348 [chan send]:
github.comcast.com/ventris/kober/vnd/github.com/prometheus/client_golang/prometheus.(*goCollector).Collect(0xc20801e8e0, 0xc20800a7e0)
	/var/lib/jenkins/jobs/Kober/workspace/src/github.comcast.com/ventris/kober/vnd/github.com/prometheus/client_golang/prometheus/go_collector.go:49 +0x6dd
github.comcast.com/ventris/kober/vnd/github.com/prometheus/client_golang/prometheus.func·028()
	/var/lib/jenkins/jobs/Kober/workspace/src/github.comcast.com/ventris/kober/vnd/github.com/prometheus/client_golang/prometheus/go_collector_test.go:27 +0x11a
created by github.comcast.com/ventris/kober/vnd/github.com/prometheus/client_golang/prometheus.TestGoCollector
	/var/lib/jenkins/jobs/Kober/workspace/src/github.comcast.com/ventris/kober/vnd/github.com/prometheus/client_golang/prometheus/go_collector_test.go:28 +0x35e

This suggested that even though the TestGoCollector test was finished, a goroutine was still hanging around. I traced it back to the call to c.Collect always sending twice of the provided channel. This change receives that second value and allows the goroutine to finish with the test.

Still can't figure out why TestHistogramConcurrency is timing out after 2 minutes :(
2015-08-12 15:23:41 -04:00
Brian Brazil babaf53025 Reserve a label prefix for use for temporary relabeling. 2015-08-12 10:34:26 +01:00
Fabian Reinartz 61d4487606 Merge pull request #156 from jimmidyson/scheme-label
Add scheme as label to allow relabelling in discovery
2015-08-06 12:42:33 +02:00
Jimmi Dyson f05ca27805 Add scheme as label to allow relabelling in discovery 2015-08-06 11:25:04 +01:00
Björn Rabenstein bd0bf27ade Merge pull request #154 from ashishgandhi/master
Use spaces instead of tabs to align equals (=)
2015-08-03 23:11:40 +02:00
Ashish Gandhi 9912488b03 Use spaces instead of tabs to align equals (=)
Using tabs to align things has the downside that people who have set the
tabstop to be of a different lenght than the orignial author's run the
risk of not having the alignment stay. In the current Makefile before
this change people with tabstop of 4 do not see the equals line up.
2015-08-03 11:34:44 -07:00
Björn Rabenstein 029ed626e6 Merge pull request #152 from realzeitmedia/document-objectives
More explicit documentation of SummaryOpts.Objectives.
2015-08-03 14:47:03 +02:00
Robert Vollmert 1e201f4328 Reword, using "φ-quantile". 2015-08-03 14:10:20 +02:00
Fabian Reinartz b09846cc89 Merge pull request #153 from realzeitmedia/gofmt
gofmt
2015-08-03 14:00:14 +02:00
Robert Vollmert f4e2f0812d gofmt 2015-08-03 13:55:09 +02:00
Robert Vollmert 5b1aa4ab69 More explicit documentation of SummaryOpts.Objectives. 2015-08-03 13:49:15 +02:00
Julius Volz ab77666071 Merge pull request #151 from msiebuhr/fuzz-text
Fuzzer for the text parser.
2015-07-31 14:05:45 +02:00
Morten Siebuhr 366bd4d57c Move build-constraints near the top. 2015-07-30 22:44:33 +02:00
Morten Siebuhr 8958a57999 Fuzzer for the text parser. 2015-07-30 22:22:55 +02:00
Brian Brazil 3a499bf7fc Merge pull request #149 from prometheus/param-prefix
Add ParamLabelPrefix for relabelling of query params.
2015-07-28 17:34:00 +01:00
Brian Brazil 8e361b05f1 Add ParamLabelPrefix for relabelling of query params. 2015-07-28 16:40:47 +01:00
Björn Rabenstein 6dbab8106e Merge pull request #148 from prometheus/beorn7/release
Cut v0.7.0
2015-07-27 17:20:18 +02:00
beorn7 06a7cb0230 Cut v0.7.0 2015-07-27 17:09:29 +02:00
Kevin Pike c945ed62c1 use metrics struct. include more statistics 2015-07-21 20:29:02 -07:00
Kevin Pike 5e9294fbb7 continue to fix errors 2015-07-21 08:38:46 -07:00
Kevin Pike 59305998f6 remove prometheus namespace references, copy paste error 2015-07-21 08:34:50 -07:00
Kevin Pike b14b149930 use counters where applicable, improve descriptions 2015-07-21 08:24:22 -07:00
Kevin Pike 8a6e3ecf23 adds general and heap memory statistics 2015-07-20 20:55:38 -07:00
Björn Rabenstein 36659fa1ad Merge pull request #145 from prometheus/beorn7/doc
Document the possibility to create "empty" metrics in a metric vector.
2015-07-15 13:39:11 +02:00
beorn7 7abba842b0 Document the possibility to create "empty" metrics in a metric vector.
This fixes https://github.com/prometheus/client_golang/issues/119.
2015-07-15 13:13:56 +02:00
Fabian Reinartz 3b16b46a71 Merge pull request #142 from prometheus/fabxc/exported
Rename ExporterLabelPrefix to ExportedLabelPrefix.
2015-06-23 13:38:51 +02:00
Fabian Reinartz 81db81dfdd Rename ExporterLabelPrefix to ExportedLabelPrefix. 2015-06-23 13:02:47 +02:00
Tobias Schmidt 00e4c46296 Merge pull request #141 from ttacon/master
Remove www subdomain from Prometheus link.
2015-06-15 23:48:08 -04:00
Trey Tacon d0526d0723 Remove www subdomain from Prometheus link.
The prometheus link in the README is broken - there is no page at www.prometheus.io (it's at promethius.io - I guess they didn't set up a redirect). @beorn7
2015-06-15 22:26:46 -04:00
Julius Volz cc283d6611 Merge pull request #138 from prometheus/update-readme
Make README.md less obtuse for beginners.
2015-06-13 12:22:35 +02:00
Julius Volz a03cc290e7 Merge pull request #139 from prometheus/fix-untyped-ref
Fix doc-comment reference to Untyped metric.
2015-06-13 12:22:23 +02:00
Julius Volz d37c6106ba Merge pull request #137 from prometheus/update-doc
Mention histograms in doc.go.
2015-06-13 12:22:12 +02:00
Julius Volz 209414d85f Mention histograms in doc.go. 2015-06-13 12:20:08 +02:00
Julius Volz b6525949dd Fix doc-comment reference to Untyped metric. 2015-06-13 02:16:27 +02:00
Julius Volz f701fb3f54 Make README.md less obtuse for beginners. 2015-06-13 02:11:33 +02:00
Björn Rabenstein cdee5e5e9b Merge pull request #133 from prometheus/beorn7/improve-error-messages
Fix a number of minor things.
2015-06-09 13:49:42 +02:00
beorn7 59f2c7d8b0 Fix a number of minor things.
- Clarify documentation about sorting requirements.
- Add missing histogram support in consistency check.
- Add label sorting to consistency check.
- Improve error messages when reporting a metric.
  (Previously, the metric name was not printed.)
2015-06-09 12:03:07 +02:00
Fabian Reinartz f17ca6af6d Merge pull request #132 from prometheus/fabxc/lname-json
Validate LabelName/LabelSet on JSON unmarshaling.
2015-06-08 13:26:47 +02:00
Fabian Reinartz a85e600fb2 Validate LabelName/LabelSet on JSON unmarshaling. 2015-06-08 12:02:05 +02:00
Björn Rabenstein e217fb58d2 Merge pull request #131 from telendt/master
Solve "The Proxy Problem" of http.InstrumentHandler
2015-06-05 12:53:18 +02:00
Tomasz Elendt dd4dd69878 Solve "The Proxy Problem" of InstrumentHandler
InstrumentHandler provides proxy object over given http.ResponseWriter
- responseWriterDelegator that only implements the bare minimum
required of an http.ResponseWriter and doesn’t implement any interface
upgrades (http.Flusher, http.Hijacker, etc.). This commit fixes it by
providing fancyResponseWriterDelegator with all the fancy bells and
whistles if standard library http.ResponseWriter is detected.

Heavily inspired by Goji's middleware.

https://avtok.com/2014/11/05/interface-upgrades.html#the-proxy-problem
2015-06-04 23:48:40 +02:00