Skip to content
This repository was archived by the owner on Oct 22, 2019. It is now read-only.

Resetable counter #35

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Resetable counter #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6ad5e8
Added reset method
Dec 30, 2016
9ad10d9
added tests for the reset method
Dec 30, 2016
8df2bdb
added support for counter resetting
Dec 30, 2016
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
19 changes: 19 additions & 0 deletions src/Prometheus/Counter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,23 @@ public function incBy($count, array $labels = array())
)
);
}

/**
* @param array $labels e.g. ['status', 'opcode']
*/
public function reset(array $labels = array())
{
$this->assertLabelsAreDefinedCorrectly($labels);
$this->storageAdapter->updateCounter(
array(
'name' => $this->getName(),
'help' => $this->getHelp(),
'type' => $this->getType(),
'labelNames' => $this->getLabelNames(),
'labelValues' => $labels,
'value' => 0,
'command' => Adapter::COMMAND_SET
)
);
}
}
9 changes: 7 additions & 2 deletions src/Prometheus/Storage/APC.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,16 @@ public function updateGauge(array $data)

public function updateCounter(array $data)
{
$new = apc_add($this->valueKey($data), 0);
$valueKey = $this->valueKey($data);
$new = apc_add($valueKey, 0);
if ($new) {
apc_store($this->metaKey($data), json_encode($this->metaData($data)));
}
apc_inc($this->valueKey($data), $data['value']);
if ($data['command'] == Adapter::COMMAND_SET) {
apc_store($valueKey, 0);
} else {
apc_inc($valueKey, $data['value']);
}
}

public function flushAPC()
Expand Down
72 changes: 72 additions & 0 deletions tests/Test/Prometheus/AbstractCounterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,78 @@ public function itShouldIncreaseTheCounterByAnArbitraryInteger()
);
}

/**
* @test
*/
public function itShouldResetWithoutLabels() {
$counter = new Counter($this->adapter, 'test', 'some_metric', 'this is for testing');
$counter->inc();
$counter->incBy(125);
$counter->reset();
$this->assertThat(
$this->adapter->collect(),
$this->equalTo(
array(
new MetricFamilySamples(
array(
'type' => Counter::TYPE,
'help' => 'this is for testing',
'name' => 'test_some_metric',
'labelNames' => array(),
'samples' => array(
array(
'labelValues' => array(),
'value' => 0,
'name' => 'test_some_metric',
'labelNames' => array()
),
)
)
)
)
)
);
}

/**
* @test
*/
public function itShouldResetWithLabels() {
$counter = new Counter($this->adapter, 'test', 'some_metric', 'this is for testing', array('foo', 'bar'));
$counter->incBy(10, array('foo1', 'bar1'));
$counter->incBy(20, array('foo2', 'bar2'));
$counter->reset(array('foo1', 'bar1'));
$this->assertThat(
$this->adapter->collect(),
$this->equalTo(
array(
new MetricFamilySamples(
array(
'type' => Counter::TYPE,
'help' => 'this is for testing',
'name' => 'test_some_metric',
'labelNames' => array('foo', 'bar'),
'samples' => array(
array(
'labelValues' => array('foo1', 'bar1'),
'value' => 0,
'name' => 'test_some_metric',
'labelNames' => array()
),
array(
'labelValues' => array('foo2', 'bar2'),
'value' => 20,
'name' => 'test_some_metric',
'labelNames' => array()
),
)
)
)
)
)
);
}

/**
* @test
* @expectedException \InvalidArgumentException
Expand Down