Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/counterAndGauge.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var counter = client.newCounter({
help: "The number of counter intervals that have elapsed."
});

gauge = client.newGauge({
var gauge = client.newGauge({
namespace: "counter_test",
name: "random_number",
help: "A random number we occasionally set."
Expand Down
10 changes: 5 additions & 5 deletions js/base_metric.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/base_metric.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions js/client.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/client.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"node": ">=0.10.0"
},
"dependencies": {
"underscore": "~1.7.0",
"debug": "~2.1.2",
"express": "~4.12.3",
"object-hash": "~0.5.0"
Expand Down
7 changes: 3 additions & 4 deletions src/base_metric.coffee
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
debug = require("debug")("prometheus-client:metric")
_ = require "underscore"
hash = require "object-hash"

module.exports = class BaseMetric
Expand All @@ -21,7 +20,7 @@ module.exports = class BaseMetric
throw "Name is required" if !@name
throw "Help is required" if !@help

@_full_name = _.compact([ @namespace, @subsystem, @name ]).join("_")
@_full_name = [ @namespace, @subsystem, @name ].filter((s)->s).join("_")

#----------

Expand Down Expand Up @@ -59,7 +58,7 @@ module.exports = class BaseMetric
# Validate each label key
for k,v of labels
throw "Label #{k} must not start with __" if /^__/.test(k)
throw "Label #{k} is reserved" if _(['instance','job']).contains(k)
throw "Label #{k} is reserved" if 'instance'==k || 'job'==k

# Validate that the set of keys is correct
if @_labelKeys && hash.keys(labels) != @_labelKeys
Expand All @@ -69,4 +68,4 @@ module.exports = class BaseMetric
@_labelKeys = hash.keys(labels) if !@_labelKeys
@_labelCache[lh] = labels

lh
lh
3 changes: 1 addition & 2 deletions src/client.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
debug = require("debug")("prometheus-client")
express = require "express"
_ = require "underscore"

module.exports = class Client
@_globalRegistry: null
Expand Down Expand Up @@ -46,4 +45,4 @@ module.exports = class Client

#----------

#----------
#----------
2 changes: 1 addition & 1 deletion test/common.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ chai = require "chai"
global.expect = chai.expect

path = require "path"
global.$src = (module) -> require path.resolve(__dirname,"..","lib",module)
global.$src = (module) -> require path.resolve(__dirname,"..","js",module)
71 changes: 71 additions & 0 deletions test/metrics.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
Prometheus = $src "client"
Registry = $src "registry"

describe 'Counter', ->
client = null
counter = null
before ->
client = new Prometheus(registry: new Registry)

counter = client.newCounter({
namespace: "counter_test",
name: "elapsed_counters_total",
help: "The number of counter intervals that have elapsed."
})

counter.increment(period:"1sec")
counter.increment(period:"2sec")

it 'should generate some counter metrics', ->
lineCount = 0
lines=[
'# HELP counter_test_elapsed_counters_total The number of counter intervals that have elapsed.\n' +
'# TYPE counter_test_elapsed_counters_total counter\n',
'counter_test_elapsed_counters_total{period="1sec"} 1\n',
'counter_test_elapsed_counters_total{period="2sec"} 1\n'
]
mockRes =
writeHead: (statusCode, header) ->
expect(statusCode).to.equal(200)
expect(header).to.deep.equal('content-type': 'text/plain; version=0.0.4')
write: (line) ->
expect(line).to.equal lines[lineCount]
lineCount++
end: () ->
expect(lineCount).to.equal lines.length

client.metricsFunc()(null, mockRes)

describe 'Gauge', ->
client = null
gauge = null
before ->
client = new Prometheus(registry: new Registry)

gauge = client.newGauge({
namespace: "gauge_test",
name: "fixed_test_number",
help: "A few test numbers we set."
});

gauge.set({ period: "1sec" }, 123);
gauge.set({ period: "1sec" }, 456);

it 'should generate some gauge metrics', ->
lineCount = 0
lines=[
'# HELP gauge_test_fixed_test_number A few test numbers we set.\n' +
'# TYPE gauge_test_fixed_test_number gauge\n',
'gauge_test_fixed_test_number{period="1sec"} 456\n'
]
mockRes =
writeHead: (statusCode, header) ->
expect(statusCode).to.equal(200)
expect(header).to.deep.equal('content-type': 'text/plain; version=0.0.4')
write: (line) ->
expect(line).to.equal lines[lineCount]
lineCount++
end: () ->
expect(lineCount).to.equal lines.length

client.metricsFunc()(null, mockRes)