Skip to content

Commit

Permalink
Further simplify API for JSON writing.
Browse files Browse the repository at this point in the history
  • Loading branch information
@raphw
raphw committed Sep 28, 2023
1 parent da91e15 commit c01c2fa
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 157 deletions.
40 changes: 15 additions & 25 deletions apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonDataWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public DslJsonDataWriter(JsonWriter jw, Reporter reporter) {
}

@Override
public void write(StructureType type) {
public void writeStructure(StructureType type) {
switch (type) {
case OBJECT_START:
jw.writeByte(JsonWriter.OBJECT_START);
Expand All @@ -52,16 +52,10 @@ public void write(StructureType type) {
case ARRAY_END:
jw.writeByte(JsonWriter.ARRAY_END);
break;
case COMMA:
case NEXT:
jw.writeByte(JsonWriter.COMMA);
break;
case SEMI:
jw.writeByte(JsonWriter.SEMI);
break;
case QUOTE:
jw.writeByte(JsonWriter.QUOTE);
break;
case NEW_LINE:
case NEW:
jw.writeByte((byte) '\n');
break;
default:
Expand All @@ -70,54 +64,50 @@ public void write(StructureType type) {
}

@Override
public void writeFieldName(String name) {
DslJsonSerializer.writeFieldName(name, jw);
public void writeKey(CharSequence name) {
jw.writeString(name);
jw.writeByte(JsonWriter.SEMI);
}

@Override
public void writeFieldName(String name, boolean sanitized) {
public void writeKey(CharSequence name, boolean sanitized) {
if (sanitized) {
DslJsonSerializer.writeStringValue(DslJsonSerializer.sanitizePropertyName(name, replaceBuilder), replaceBuilder, jw);
DslJsonSerializer.writeStringValue(DslJsonSerializer.sanitizePropertyName(name.toString(), replaceBuilder), replaceBuilder, jw);
jw.writeByte(JsonWriter.SEMI);
} else {
writeFieldName(name);
writeKey(name);
}
}

@Override
public void serialize(boolean value) {
public void writeValue(boolean value) {
BoolConverter.serialize(value, jw);
}

@Override
public void serialize(long value) {
public void writeValue(long value) {
NumberConverter.serialize(value, jw);
}

@Override
public void serialize(double value) {
public void writeValue(double value) {
NumberConverter.serialize(value, jw);
}

@Override
public void writeString(CharSequence value) {
public void writeValue(CharSequence value) {
jw.writeString(value);
}

@Override
public void writeString(CharSequence value, boolean trimmed) {
public void writeValue(CharSequence value, boolean trimmed) {
if (trimmed) {
DslJsonSerializer.writeStringValue(value, replaceBuilder, jw);
} else {
writeString(value);
writeValue(value);
}
}

@Override
public String sanitizePropertyName(String key) {
return DslJsonSerializer.sanitizePropertyName(key, replaceBuilder).toString();
}

@Override
public int size() {
return jw.size();
Expand Down
105 changes: 51 additions & 54 deletions ...ugin/src/main/java/co/elastic/apm/agent/micrometer/MicrometerMeterRegistrySerializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,10 @@

import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.ARRAY_END;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.ARRAY_START;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.COMMA;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.NEW_LINE;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.NEXT;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.NEW;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.OBJECT_END;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.OBJECT_START;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.QUOTE;
import static co.elastic.apm.agent.tracer.reporting.DataWriter.StructureType.SEMI;

public class MicrometerMeterRegistrySerializer {

Expand Down Expand Up @@ -100,17 +98,17 @@ public List<DataWriter> serialize(final Map<Meter.Id, Meter> metersById, final l
boolean serializeMetricSet(List<Tag> tags, List<Meter> meters, long epochMicros, DataWriter writer) {
boolean hasSamples = false;
boolean dedotMetricName = config.isDedotCustomMetrics();
writer.write(OBJECT_START);
writer.writeStructure(OBJECT_START);
{
writer.writeFieldName("metricset");
writer.write(OBJECT_START);
writer.writeKey("metricset");
writer.writeStructure(OBJECT_START);
{
writer.writeFieldName("timestamp");
writer.serialize(epochMicros);
writer.write(COMMA);
writer.writeKey("timestamp");
writer.writeValue(epochMicros);
writer.writeStructure(NEXT);
serializeTags(tags, writer);
writer.writeFieldName("samples");
writer.write(OBJECT_START);
writer.writeKey("samples");
writer.writeStructure(OBJECT_START);

ClassLoader originalContextCL = PrivilegedActionUtils.getContextClassLoader(Thread.currentThread());
try {
Expand Down Expand Up @@ -156,31 +154,31 @@ boolean serializeMetricSet(List<Tag> tags, List<Meter> meters, long epochMicros,
} finally {
PrivilegedActionUtils.setContextClassLoader(Thread.currentThread(), originalContextCL);
}
writer.write(OBJECT_END);
writer.writeStructure(OBJECT_END);
}
writer.write(OBJECT_END);
writer.writeStructure(OBJECT_END);
}
writer.write(OBJECT_END);
writer.write(NEW_LINE);
writer.writeStructure(OBJECT_END);
writer.writeStructure(NEW);
return hasSamples;
}

private static void serializeTags(List<Tag> tags, DataWriter writer) {
if (tags.isEmpty()) {
return;
}
writer.writeFieldName("tags");
writer.write(OBJECT_START);
writer.writeKey("tags");
writer.writeStructure(OBJECT_START);
for (int i = 0, tagsSize = tags.size(); i < tagsSize; i++) {
Tag tag = tags.get(i);
if (i > 0) {
writer.write(COMMA);
writer.writeStructure(NEXT);
}
writer.writeFieldName(tag.getKey(), true);
writer.writeString(tag.getValue(), true);
writer.writeKey(tag.getKey(), true);
writer.writeValue(tag.getValue(), true);
}
writer.write(OBJECT_END);
writer.write(COMMA);
writer.writeStructure(OBJECT_END);
writer.writeStructure(NEXT);
}

/**
Expand All @@ -197,12 +195,12 @@ private static void serializeTags(List<Tag> tags, DataWriter writer) {
*/
private static boolean serializeTimer(DataWriter writer, HistogramSnapshot histogramSnapshot, Meter.Id id, long count, double totalTime, boolean hasValue, boolean dedotMetricName) {
if (isValidValue(totalTime)) {
if (hasValue) writer.write(COMMA);
if (hasValue) writer.writeStructure(NEXT);
serializeValue(id, ".count", count, writer, dedotMetricName);
writer.write(COMMA);
writer.writeStructure(NEXT);
serializeValue(id, ".sum.us", totalTime, writer, dedotMetricName);
if (histogramSnapshot != null && histogramSnapshot.histogramCounts().length > 0) {
writer.write(COMMA);
writer.writeStructure(NEXT);
serializeHistogram(id, histogramSnapshot, writer, dedotMetricName);
}
return true;
Expand All @@ -224,12 +222,12 @@ private static boolean serializeTimer(DataWriter writer, HistogramSnapshot histo
*/
private static boolean serializeDistributionSummary(DataWriter writer, HistogramSnapshot histogramSnapshot, Meter.Id id, long count, double totalAmount, boolean hasValue, boolean dedotMetricName) {
if (isValidValue(totalAmount)) {
if (hasValue) writer.write(COMMA);
if (hasValue) writer.writeStructure(NEXT);
serializeValue(id, ".count", count, writer, dedotMetricName);
writer.write(COMMA);
writer.writeStructure(NEXT);
serializeValue(id, ".sum", totalAmount, writer, dedotMetricName);
if (histogramSnapshot != null && histogramSnapshot.histogramCounts().length > 0) {
writer.write(COMMA);
writer.writeStructure(NEXT);
serializeHistogram(id, histogramSnapshot, writer, dedotMetricName);
}
return true;
Expand All @@ -244,45 +242,44 @@ private static void serializeHistogram(Meter.Id id, HistogramSnapshot histogramS
String suffix = ".histogram";
CountAtBucket[] bucket = histogramSnapshot.histogramCounts();
serializeObjectStart(id.getName(), "values", suffix, writer, dedotMetricName);
writer.write(ARRAY_START);
writer.writeStructure(ARRAY_START);
if (bucket.length > 0) {
writer.serialize(bucket[0].bucket());
writer.writeValue(bucket[0].bucket());
for (int i = 1; i < bucket.length; i++) {
writer.write(COMMA);
writer.serialize(bucket[i].bucket());
writer.writeStructure(NEXT);
writer.writeValue(bucket[i].bucket());
}
}
writer.write(ARRAY_END);
writer.write(COMMA);
writer.writeString("counts");
writer.write(SEMI);
writer.write(ARRAY_START);
writer.writeStructure(ARRAY_END);
writer.writeStructure(NEXT);
writer.writeKey("counts");
writer.writeStructure(ARRAY_START);
// Micrometer bucket counts are cumulative: E.g. the count at bucket with upper
// boundary X is the total number of observations smaller than X
// including values which have already been counted for smaller buckets.
// Elastic however expects non-cumulative bucket counts
if (bucket.length > 0) {
writer.serialize((long) bucket[0].count());
writer.writeValue((long) bucket[0].count());
double prevBucketCount = bucket[0].count();
for (int i = 1; i < bucket.length; i++) {
writer.write(COMMA);
writer.serialize((long) (bucket[i].count() - prevBucketCount));
writer.writeStructure(NEXT);
writer.writeValue((long) (bucket[i].count() - prevBucketCount));
prevBucketCount = bucket[i].count();
}
}
writer.write(ARRAY_END);
writer.writeStructure(ARRAY_END);

writer.write(COMMA);
writer.writeFieldName("type");
writer.writeString("histogram");
writer.writeStructure(NEXT);
writer.writeKey("type");
writer.writeValue("histogram");

writer.write(OBJECT_END);
writer.writeStructure(OBJECT_END);
}

private static void serializeValue(Meter.Id id, String suffix, long value, DataWriter writer, boolean dedotMetricName) {
serializeValueStart(id.getName(), suffix, writer, dedotMetricName);
writer.serialize(value);
writer.write(OBJECT_END);
writer.writeValue(value);
writer.writeStructure(OBJECT_END);
}

/**
Expand All @@ -297,7 +294,7 @@ private static void serializeValue(Meter.Id id, String suffix, long value, DataW
*/
private static boolean serializeValue(Meter.Id id, double value, boolean hasValue, DataWriter writer, boolean dedotMetricName) {
if (isValidValue(value)) {
if (hasValue) writer.write(COMMA);
if (hasValue) writer.writeStructure(NEXT);
serializeValue(id, "", value, writer, dedotMetricName);
return true;
}
Expand All @@ -306,8 +303,8 @@ private static boolean serializeValue(Meter.Id id, double value, boolean hasValu

private static void serializeValue(Meter.Id id, String suffix, double value, DataWriter writer, boolean dedotMetricName) {
serializeValueStart(id.getName(), suffix, writer, dedotMetricName);
writer.serialize(value);
writer.write(OBJECT_END);
writer.writeValue(value);
writer.writeStructure(OBJECT_END);
}

private static void serializeValueStart(String key, String suffix, DataWriter writer, boolean dedotMetricName) {
Expand All @@ -321,9 +318,9 @@ private static void serializeObjectStart(String key, String objectName, String s
} else {
name = key + suffix;
}
writer.writeFieldName(name, dedotMetricName);
writer.write(OBJECT_START);
writer.writeFieldName(objectName);
writer.writeKey(name, dedotMetricName);
writer.writeStructure(OBJECT_START);
writer.writeKey(objectName);
}

private static boolean isValidValue(double value) {
Expand Down
Loading

0 comments on commit c01c2fa

Please sign in to comment.