93edea3720
Do not parse json on 204 responses ( #476 )
...
* Do not return BadResponse for no content
Signed-off-by: Adam Jaso <2285656+adamjaso@users.noreply.github.com>
2018-10-10 17:20:17 +03:00
e1fb14a776
Adjust TestRegisterWithOrGet to the present
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-10-10 15:41:21 +02:00
0a8115f42e
Merge pull request #474 from prometheus/beorn7/testing
...
Add check for duplicated label name
2018-10-01 19:40:01 +02:00
edb489a1ef
Add check for duplicated label names
...
Fixes #471
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-30 16:25:48 +02:00
dd9e125455
Expose failure to detect duplicate label names
...
This is #471 .
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-30 16:25:48 +02:00
daeaac0cfb
Merge pull request #472 from prometheus/beorn7/registry
...
Fix a few minor things...
2018-09-29 11:53:47 +02:00
ff0177896a
Be more precise about concurrency requirements
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-29 10:47:28 +02:00
7eb5e8a08a
Drain the desc channel after registering
...
This avoids leaking goroutines.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-29 10:44:19 +02:00
2d5a6493f8
Merge pull request #467 from daveworth/patch-1
...
fix exponential buckets failure message
2018-09-26 16:21:55 +02:00
c2c648fdcb
fix exponential buckets failure message
...
it appears there is a copy/paste error in the exponential buckets test failure message which is fixed here.
Signed-off-by: David Worth <dworth@strava.com>
2018-09-25 17:42:06 -06:00
f69c853d21
Merge pull request #466 from prometheus/beorn7/histogram
...
Ensure 64bit alignment on 32bit platforms for histograms
2018-09-24 13:34:49 +02:00
7973e4709d
Ensure 64bit alignment on 32bit platforms for histograms
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-24 13:28:13 +02:00
73edb9af66
Merge pull request #462 from prometheus/beorn7/testing
...
Add Go 1.11
2018-09-19 13:43:04 +02:00
3a6edf5ff8
Handle items newly deprecated in Go 1.11
...
Remove where possible and ignore staticcheck warnings where we have
to.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-19 13:30:14 +02:00
2c6e80549e
Add Go 1.11.
...
Since the staticcheck support for older Go versions will disappear,
update the exclusion regexp.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-19 12:24:24 +02:00
e637cec7d9
Merge pull request #460 from prometheus/beorn7/desc
...
Detect invalid Descs in const metrics, but also allow empty Help strings.
2018-09-17 12:21:22 +02:00
663a9ad019
Make Help strings optional
...
This is in line with
https://prometheus.io/docs/instrumenting/writing_clientlibs/#metric-description-and-help
Since the zero value of a string in Go is `""`, we cannot distinguish
between a Help string not set and an empty Help string. Thus, we just
make it formally optional here with an encouragement to set it in the
doc comment.
In v0.10, the Help string will probably become a "normal" argument of
the constructor rather than a field in an Opts struct.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-17 12:07:31 +02:00
713e6eb604
Let NewConst... functions detect invalid Desc
...
The error of the invalid Desc is returned in that case.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-17 11:50:42 +02:00
b7b390014b
Reformat doc comment of InstrumentHandler
...
To help linters detect the Deprecated message.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-14 13:24:05 +02:00
cec67c9ec8
Improve deprecated doc comment
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-14 12:48:16 +02:00
1362cad3aa
Merge pull request #458 from prometheus/beorn7/registry
...
Wrappable registerers
2018-09-14 12:15:22 +02:00
fe28f32433
Discourage prefixing every metris with WrapRegistererWithPrefix
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-14 11:59:13 +02:00
cf9b2a8c78
Rename WrapWith... to WrapRegistererWith...
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-13 17:43:05 +02:00
837c7cb1f4
Update Collector example
...
It now uses the new WrapWith function instead of ConstLabels. Describe
is now implemented via DescribeByCollect.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-12 15:34:13 +02:00
84d7aa0cd9
Add wrapping of Registerers with labels and prefix
...
Essentially middleware for Registerers!
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-12 15:34:07 +02:00
b5bfa0eb2c
Merge pull request #457 from prometheus/beorn7/histogram
...
Lock-free atomic observations in Histograms!
2018-09-12 15:04:00 +02:00
1b2bd1d665
Make Histogram observations atomic while keeping them lock-free
...
Fixes #275
This is rather tricky and required some studying of the Go memory
model. I have added copious code comments to explain what's going on.
Benchmarks haven't changed significantly, despite the additional
atomic operations now required during Observe. Write performance is
noticable, but it is also much more involved now and has a mutex. (But
note that Write is supposed to be a relatively rare operation and thus
not in the hot path compared to Observe.) Allocs haven't changed at
all.
OLD:
BenchmarkHistogramWithLabelValues-4 10000000 151 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramNoLabels-4 50000000 36.0 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramObserve1-4 50000000 28.1 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramObserve2-4 10000000 160 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramObserve4-4 5000000 378 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramObserve8-4 2000000 768 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramWrite1-4 1000000 1589 ns/op 896 B/op 37 allocs/op
BenchmarkHistogramWrite2-4 500000 2973 ns/op 1792 B/op 74 allocs/op
BenchmarkHistogramWrite4-4 300000 6979 ns/op 3584 B/op 148 allocs/op
BenchmarkHistogramWrite8-4 100000 10701 ns/op 7168 B/op 296 allocs/op
NEW:
BenchmarkHistogramWithLabelValues-4 10000000 191 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramNoLabels-4 30000000 50.1 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramObserve1-4 30000000 40.0 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramObserve2-4 20000000 91.5 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramObserve4-4 5000000 317 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramObserve8-4 2000000 636 ns/op 0 B/op 0 allocs/op
BenchmarkHistogramWrite1-4 1000000 2072 ns/op 896 B/op 37 allocs/op
BenchmarkHistogramWrite2-4 300000 3729 ns/op 1792 B/op 74 allocs/op
BenchmarkHistogramWrite4-4 200000 7847 ns/op 3584 B/op 148 allocs/op
BenchmarkHistogramWrite8-4 100000 16975 ns/op 7168 B/op 296 allocs/op
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-12 15:03:44 +02:00
1e08f788cf
Add test to expose #275
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-07 19:04:00 +02:00
7858729281
Merge pull request #456 from prometheus/beorn7/process_collector
...
Rework process collector
2018-09-07 12:25:42 +02:00
773f502723
Rework process collector
...
This unifies both constructors in one with an options argument.
The options argument allows to switch on error reporting, as discussed
in #219 .
The change of the contructor signature is breaking, but only mildly
so. Plus, the process collector is rarely used explicitly. I used
Sourcegraph to search for public usages, with the following results:
- 2 occurrences of NewProcessCollectorPIDFn, once in @discordianfish's
glimpse, once in @fabxc's etcd_exporter (deprecated anyway). Both
are Prom veterans and will simply do the one line change if needed.
- 8 occurrences of NewProcessCollector, of which 7 are of the form
NewProcessCollector(os.Getpid(), "")
Thus, it's a very easy change, which I even hinted at in the doc
comment.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-07 12:09:26 +02:00
3525612fea
Merge pull request #455 from prometheus/beorn7/desc
...
Add a DescribeByCollect helper
2018-09-05 14:55:05 +02:00
6803bb4021
Add a DescribeByCollect helper
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-05 14:10:51 +02:00
2dbc3a58c2
Merge pull request #454 from prometheus/beorn7/testing
...
Add a single-value extractor and general package doc
2018-09-04 14:48:51 +02:00
74a2f46d2c
Add package documentation
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-04 14:02:20 +02:00
1301cf8fcd
Add helper function to extract a simple float value from a metric
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
foo
2018-09-04 14:02:19 +02:00
d968d2292e
Merge pull request #453 from prometheus/beorn7/deprecation
...
Un-export prometheus.LabelPairSorter
2018-09-03 17:41:12 +02:00
da330f4281
Un-export prometheus.LabelPairSorter
...
The only known external usage of it was in prometheus/pushgateway,
where it was removed by
https://github.com/prometheus/pushgateway/pull/200 .
Originally, the expectation was that users would implement the Metric
interface now and then. As we know now, neither it is happening, nor
would it make a lot of sense. (Users implement the Collector interface
instead.) By now, LabelPairSorter is essentially noise in the already
quite cluttered namespace in the prometheus package.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-03 16:20:55 +02:00
a10423e9da
Merge pull request #445 from prometheus/beorn7/testing
...
Add testutil package
2018-09-03 00:31:34 +02:00
74cfc2394a
Merge pull request #452 from prometheus/beorn7/testing2
...
Create an internal package
2018-09-03 00:31:06 +02:00
7be86f93c1
Create an internal package
...
This is for types we don't want to export but which are used in
different packages within client_golang.
Currently, that's only NormalizeMetricFamilies (used in the prometheus
package and in the testutil package). More to be added as needed.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-03 00:18:11 +02:00
5ba0993f6f
Improved interface
...
- Expected text format is now read from an io.Reader.
- Metrics are gathered from a Gatherer.
- Added a convenience wrapper to collect from a Collector.
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-09-02 21:07:38 +02:00
676eaf6b94
Merge pull request #451 from prometheus/beorn7/ci
...
Add test-short target and use it in CI
2018-08-28 22:48:07 +02:00
db9651a839
Add test-short target and use it in CI
...
This is reinstating the old behavior. The longer tests are not only
long but also flaky. (The former is by design, the latter is a bug.)
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-08-28 15:13:08 +02:00
1216062c28
Merge pull request #448 from tariq1890/fix_docker_label
...
Using the recommended label syntax for maintainer in Dockerfile.
2018-08-28 15:00:45 +02:00
3653aff4d5
Merge pull request #450 from hotpxl/master
...
Typo in summary.go
2018-08-28 00:10:46 +02:00
94f32c433e
typo
...
Signed-off-by: Yutian Li <hotpxless@gmail.com>
2018-08-27 12:01:30 -04:00
6b1dd88302
Using the recommended label syntax for maintainer in Dockerfile.
...
Signed-off-by: Tariq Ibrahim <tariq.ibrahim@microsoft.com>
2018-08-27 08:28:47 -07:00
4eb539fa85
Add prometheus common makefile ( #446 )
...
* Add prometheus common makefile
* Override test target to depends on get_dep
* Exclude staticcheck for go version 1.7.x and 1.8.x
Signed-off-by: glefloch <glfloch@gmail.com>
2018-08-24 12:10:16 +02:00
154f28a316
Fix import grouping
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-08-23 00:05:02 +02:00
e60f998e9b
Make license headers consistent
...
Signed-off-by: beorn7 <beorn@soundcloud.com>
2018-08-22 23:59:40 +02:00
Adam Jaso