Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sure each Beacon ping includes current time #681

Merged
merged 1 commit into from
Jan 31, 2018
Merged

Make sure each Beacon ping includes current time #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...rics-client/src/main/java/io/confluent/ksql/version/metrics/collector/BasicCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@

public class BasicCollector extends Collector {

private final long time;
private final TimeUtils timeUtils;
private final KsqlModuleType moduleType;

public BasicCollector(KsqlModuleType moduleType, TimeUtils timeUtils) {
time = timeUtils.nowInUnixTime();
this.timeUtils = timeUtils;
this.moduleType = moduleType;
}

@Override
public GenericContainer collectMetrics() {
KsqlVersionMetrics metricsRecord = new KsqlVersionMetrics();
metricsRecord.setTimestamp(time);
metricsRecord.setTimestamp(timeUtils.nowInUnixTime());
metricsRecord.setConfluentPlatformVersion(Version.getVersion());
metricsRecord.setKsqlComponentType(moduleType.name());
return metricsRecord;
Expand Down
54 changes: 48 additions & 6 deletions ...-client/src/test/java/io/confluent/ksql/version/metrics/collector/BasicCollectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,41 @@

package io.confluent.ksql.version.metrics.collector;

import org.easymock.EasyMock;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;

import static org.junit.Assert.assertEquals;

import java.util.Collection;
import java.util.EnumSet;

import io.confluent.ksql.version.metrics.KsqlVersionMetrics;
import io.confluent.support.metrics.common.Version;
import io.confluent.support.metrics.common.time.Clock;
import io.confluent.support.metrics.common.time.TimeUtils;

@RunWith(Parameterized.class)
public class BasicCollectorTest {

public class MockClock implements Clock {
private long currentTime = 0;

public MockClock() {
}

public long currentTimeMs() {
return currentTime;
}

public void setCurrentTimeMillis(long timeMillis) {
currentTime = timeMillis;
}
}

@Parameterized.Parameters
public static Collection<KsqlModuleType> data() {
return EnumSet.allOf(KsqlModuleType.class);
Expand All @@ -41,20 +59,44 @@ public static Collection<KsqlModuleType> data() {
@Parameterized.Parameter
public KsqlModuleType moduleType;

@Test
public void testGetCollector(){
private MockClock mockClock;
private TimeUtils timeUtils;

@Before
public void setUp() throws Exception {
mockClock = new MockClock();
timeUtils = new TimeUtils(mockClock);
}

TimeUtils timeUtils = EasyMock.mock(TimeUtils.class);
EasyMock.expect(timeUtils.nowInUnixTime()).andReturn(System.currentTimeMillis()).anyTimes();
EasyMock.replay(timeUtils);
@Test
public void testGetCollector() {
BasicCollector basicCollector = new BasicCollector(moduleType, timeUtils);

KsqlVersionMetrics expectedMetrics = new KsqlVersionMetrics();
expectedMetrics.setTimestamp(timeUtils.nowInUnixTime());
expectedMetrics.setConfluentPlatformVersion(Version.getVersion());
expectedMetrics.setKsqlComponentType(moduleType.name());

// should match because we don't advance the clock
Assert.assertThat(basicCollector.collectMetrics(), CoreMatchers.equalTo(expectedMetrics));
}

@Test
public void testCollectMetricsAssignsCurrentTime() {
Long currentTimeSec = 1000l;

mockClock.setCurrentTimeMillis(currentTimeSec * 1000);
BasicCollector basicCollector = new BasicCollector(moduleType, timeUtils);

currentTimeSec += 12300l;
mockClock.setCurrentTimeMillis(currentTimeSec * 1000);
KsqlVersionMetrics metrics = (KsqlVersionMetrics) basicCollector.collectMetrics();
assertEquals(currentTimeSec, metrics.getTimestamp());

currentTimeSec += 734l;
mockClock.setCurrentTimeMillis(currentTimeSec * 1000);
metrics = (KsqlVersionMetrics) basicCollector.collectMetrics();
assertEquals(currentTimeSec, metrics.getTimestamp());
}

}