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

Use elastic create operation instead of index #2997

Merged
merged 3 commits into from
Feb 16, 2022
Merged

Use elastic create operation instead of index #2997

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
296811c
Use elastic create operation instead of index
jeremyross Feb 6, 2022
0d446c0
Polish, better naming.
jeremyross Feb 7, 2022
5bd2e5d
Update tests
shakuzen Feb 16, 2022
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
8 changes: 4 additions & 4 deletions ...micrometer-registry-elastic/src/main/java/io/micrometer/elastic/ElasticMeterRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public class ElasticMeterRegistry extends StepMeterRegistry {

private final DateTimeFormatter indexDateFormatter;

private final String indexLine;
private final String actionLine;

private volatile boolean checkedForIndexTemplate;

Expand All @@ -147,9 +147,9 @@ protected ElasticMeterRegistry(ElasticConfig config, Clock clock, ThreadFactory
indexDateFormatter = DateTimeFormatter.ofPattern(config.indexDateFormat());
this.httpClient = httpClient;
if (StringUtils.isNotEmpty(config.pipeline())) {
indexLine = "{ \"index\" : {\"pipeline\":\"" + config.pipeline() + "\"} }\n";
actionLine = "{ \"create\" : {\"pipeline\":\"" + config.pipeline() + "\"} }\n";
} else {
indexLine = "{ \"index\" : {} }\n";
actionLine = "{ \"create\" : {} }\n";
}

start(threadFactory);
Expand Down Expand Up @@ -404,7 +404,7 @@ protected String generateTimestamp() {

// VisibleForTesting
String writeDocument(Meter meter, Consumer<StringBuilder> consumer) {
StringBuilder sb = new StringBuilder(indexLine);
StringBuilder sb = new StringBuilder(actionLine);
String timestamp = generateTimestamp();
String name = getConventionName(meter.getId());
String type = meter.getId().getType().toString().toLowerCase();
Expand Down
22 changes: 11 additions & 11 deletions ...ometer-registry-elastic/src/test/java/io/micrometer/elastic/ElasticMeterRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void timestampFormat() {
@Test
void writeTimer() {
Timer timer = Timer.builder("myTimer").register(registry);
assertThat(registry.writeTimer(timer)).contains("{ \"index\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"myTimer\",\"type\":\"timer\",\"count\":0,\"sum\":0.0,\"mean\":0.0,\"max\":0.0}");
assertThat(registry.writeTimer(timer)).contains("{ \"create\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"myTimer\",\"type\":\"timer\",\"count\":0,\"sum\":0.0,\"mean\":0.0,\"max\":0.0}");
}

@Test
Expand All @@ -57,15 +57,15 @@ void writeCounter() {
counter.increment();
clock.add(config.step());
assertThat(registry.writeCounter(counter))
.contains("{ \"index\" : {} }\n{\"@timestamp\":\"1970-01-01T00:01:00.001Z\",\"name\":\"myCounter\",\"type\":\"counter\",\"count\":1.0}");
.contains("{ \"create\" : {} }\n{\"@timestamp\":\"1970-01-01T00:01:00.001Z\",\"name\":\"myCounter\",\"type\":\"counter\",\"count\":1.0}");
}

@Test
void writeFunctionCounter() {
FunctionCounter counter = FunctionCounter.builder("myCounter", 123.0, Number::doubleValue).register(registry);
clock.add(config.step());
assertThat(registry.writeFunctionCounter(counter))
.contains("{ \"index\" : {} }\n{\"@timestamp\":\"1970-01-01T00:01:00.001Z\",\"name\":\"myCounter\",\"type\":\"counter\",\"count\":123.0}");
.contains("{ \"create\" : {} }\n{\"@timestamp\":\"1970-01-01T00:01:00.001Z\",\"name\":\"myCounter\",\"type\":\"counter\",\"count\":123.0}");
}

@Test
Expand All @@ -86,21 +86,21 @@ void nanFunctionTimerShouldNotBeWritten() {
void writeGauge() {
Gauge gauge = Gauge.builder("myGauge", 123.0, Number::doubleValue).register(registry);
assertThat(registry.writeGauge(gauge))
.contains("{ \"index\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"myGauge\",\"type\":\"gauge\",\"value\":123.0}");
.contains("{ \"create\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"myGauge\",\"type\":\"gauge\",\"value\":123.0}");
}

@Test
void writeTimeGauge() {
TimeGauge gauge = TimeGauge.builder("myGauge", 123.0, TimeUnit.MILLISECONDS, Number::doubleValue).register(registry);
assertThat(registry.writeTimeGauge(gauge))
.contains("{ \"index\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"myGauge\",\"type\":\"gauge\",\"value\":123.0}");
.contains("{ \"create\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"myGauge\",\"type\":\"gauge\",\"value\":123.0}");
}

@Test
void writeLongTaskTimer() {
LongTaskTimer timer = LongTaskTimer.builder("longTaskTimer").register(registry);
assertThat(registry.writeLongTaskTimer(timer))
.contains("{ \"index\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"longTaskTimer\",\"type\":\"long_task_timer\",\"activeTasks\":0,\"duration\":0.0}");
.contains("{ \"create\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"longTaskTimer\",\"type\":\"long_task_timer\",\"activeTasks\":0,\"duration\":0.0}");
}

@Test
Expand All @@ -110,14 +110,14 @@ void writeSummary() {
summary.record(456);
clock.add(config.step());
assertThat(registry.writeSummary(summary))
.contains("{ \"index\" : {} }\n{\"@timestamp\":\"1970-01-01T00:01:00.001Z\",\"name\":\"summary\",\"type\":\"distribution_summary\",\"count\":2,\"sum\":579.0,\"mean\":289.5,\"max\":456.0}");
.contains("{ \"create\" : {} }\n{\"@timestamp\":\"1970-01-01T00:01:00.001Z\",\"name\":\"summary\",\"type\":\"distribution_summary\",\"count\":2,\"sum\":579.0,\"mean\":289.5,\"max\":456.0}");
}

@Test
void writeMeter() {
Timer timer = Timer.builder("myTimer").register(registry);
assertThat(registry.writeMeter(timer))
.contains("{ \"index\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"myTimer\",\"type\":\"timer\",\"count\":\"0.0\",\"total\":\"0.0\",\"max\":\"0.0\"}");
.contains("{ \"create\" : {} }\n{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"myTimer\",\"type\":\"timer\",\"count\":\"0.0\",\"total\":\"0.0\",\"max\":\"0.0\"}");
}

@Test
Expand All @@ -139,7 +139,7 @@ void writeMeterWhenCustomMeterHasMixedFiniteAndNonFiniteValuesShouldSkipOnlyNonF
Measurement measurement5 = new Measurement(() -> 2d, Statistic.VALUE);
List<Measurement> measurements = Arrays.asList(measurement1, measurement2, measurement3, measurement4, measurement5);
Meter meter = Meter.builder("my.meter", Meter.Type.GAUGE, measurements).register(this.registry);
assertThat(registry.writeMeter(meter)).contains("{ \"index\" : {} }\n" +
assertThat(registry.writeMeter(meter)).contains("{ \"create\" : {} }\n" +
"{\"@timestamp\":\"1970-01-01T00:00:00.001Z\",\"name\":\"my_meter\",\"type\":\"gauge\",\"value\":\"1.0\",\"value\":\"2.0\"}");
}

Expand All @@ -148,7 +148,7 @@ void writeTags() {
Counter counter = Counter.builder("myCounter").tag("foo", "bar").tag("spam", "eggs").register(registry);
counter.increment();
clock.add(config.step());
assertThat(registry.writeCounter(counter)).contains("{ \"index\" : {} }\n" +
assertThat(registry.writeCounter(counter)).contains("{ \"create\" : {} }\n" +
"{\"@timestamp\":\"1970-01-01T00:01:00.001Z\",\"name\":\"myCounter\",\"type\":\"counter\",\"foo\":\"bar\",\"spam\":\"eggs\",\"count\":1.0}");
}

Expand All @@ -168,7 +168,7 @@ void wholeCountIsReportedWithDecimal() {
Counter c = Counter.builder("counter").register(registry);
c.increment(10);
clock.add(config.step());
assertThat(registry.writeCounter(c)).contains("{ \"index\" : {} }\n" +
assertThat(registry.writeCounter(c)).contains("{ \"create\" : {} }\n" +
"{\"@timestamp\":\"1970-01-01T00:01:00.001Z\",\"name\":\"counter\",\"type\":\"counter\",\"count\":10.0}");
}

Expand Down