Skip to content

DSL debugger (OAL): emit source @ScopeDefaultColumn fields on output sample via codegen #13867

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

Merged
wu-sheng merged 1 commit into from
May 9, 2026
+28 −1
Merged

DSL debugger (OAL): emit source @ScopeDefaultColumn fields on output sample via codegen #13867

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
11 changes: 10 additions & 1 deletion ...rver/oal-rt/src/main/java/org/apache/skywalking/oal/v2/generator/OALClassGeneratorV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,16 @@ public class OALClassGeneratorV2 {
"deserialize",
"getMeta",
"toHour",
"toDay"
"toDay",
// Emits the source's @ScopeDefaultColumn fields (the codegen-
// materialised dynamic @Column fields on the generated subclass)
// onto the dsl-debugging `output` sample. For a Service-style
// scope that is exactly entityId + attr0..attr5 — nothing about
// the metric's own value, which is delegated upward via
// super.appendDebugFields(obj) to the family parent's override
// (CPMMetrics emits total + value, SumMetrics emits value,
// LongAvgMetrics emits summation + count + value, …).
"appendDebugFields"
};
private static final String[] METRICS_BUILDER_CLASS_METHODS = {
"entity2Storage",
Expand Down
18 changes: 18 additions & 0 deletions oap-server/oal-rt/src/main/resources/code-templates-v2/metrics/appendDebugFields.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
protected void appendDebugFields(com.google.gson.JsonObject obj) {
super.appendDebugFields(obj);
<#list fieldsFromSource as field>
<#if field.typeName == "long">
obj.addProperty("${field.columnName}", java.lang.Long.valueOf(${field.fieldGetter}()));
Comment on lines +1 to +5
<#elseif field.typeName == "int">
obj.addProperty("${field.columnName}", java.lang.Integer.valueOf(${field.fieldGetter}()));
<#elseif field.typeName == "double">
obj.addProperty("${field.columnName}", java.lang.Double.valueOf(${field.fieldGetter}()));
<#elseif field.typeName == "float">
obj.addProperty("${field.columnName}", java.lang.Float.valueOf(${field.fieldGetter}()));
<#elseif field.typeName == "boolean">
obj.addProperty("${field.columnName}", java.lang.Boolean.valueOf(${field.fieldGetter}()));
<#else>
obj.addProperty("${field.columnName}", ${field.fieldGetter}() == null ? null : ${field.fieldGetter}().toString());
</#if>
</#list>
}
Loading