Add ObjectAllocationSample type support

grafana · Sep 9, 2024 · a057255 · a057255
1 parent c7aebd8
commit a057255
Show file tree

Hide file tree

Showing 32 changed files with 530 additions and 13 deletions.
diff --git a/gen/main.go b/gen/main.go
@@ -67,6 +67,7 @@ func main() {
 	write("types/execution_sample.go", generate(&Type_jdk_ExecutionSample, options{}))
 	write("types/allocation_in_new_tlab.go", generate(&Type_jdk_ObjectAllocationInNewTLAB, options{}))
 	write("types/allocation_outside_tlab.go", generate(&Type_jdk_ObjectAllocationOutsideTLAB, options{}))
+	write("types/allocation_sample.go", generate(&Type_jdk_ObjectAllocationSample, options{}))
 	write("types/monitor_enter.go", generate(&Type_jdk_JavaMonitorEnter, options{}))
 	write("types/thread_park.go", generate(&Type_jdk_ThreadPark, options{}))
 	write("types/live_object.go", generate(&Type_profiler_LiveObject, options{}))

diff --git a/gen/types.go b/gen/types.go
@@ -54,6 +54,7 @@ var (
 	T_MEMORY_ADDRESS          = def.TypeID(206)
 	T_UNSIGNED                = def.TypeID(207)
 	T_PERCENTAGE              = def.TypeID(208)
+	T_ALLOC_SAMPLE            = def.TypeID(209)
 )
 
 func TypeID2Sym(id def.TypeID) string {
@@ -110,6 +111,8 @@ func TypeID2Sym(id def.TypeID) string {
 		return "T_ALLOC_IN_NEW_TLAB"
 	case T_ALLOC_OUTSIDE_TLAB:
 		return "T_ALLOC_OUTSIDE_TLAB"
+	case T_ALLOC_SAMPLE:
+		return "T_ALLOC_SAMPLE"
 	case T_MONITOR_ENTER:
 		return "T_MONITOR_ENTER"
 	case T_THREAD_PARK:
@@ -330,6 +333,18 @@ var Type_jdk_ObjectAllocationOutsideTLAB = def.Class{
 		{Name: "contextId", Type: T_LONG, ConstantPool: false},
 	},
 }
+var Type_jdk_ObjectAllocationSample = def.Class{
+	Name: "jdk.ObjectAllocationSample",
+	ID:   T_ALLOC_SAMPLE,
+	Fields: []def.Field{
+		{Name: "startTime", Type: T_LONG, ConstantPool: false},
+		{Name: "eventThread", Type: T_THREAD, ConstantPool: true},
+		{Name: "stackTrace", Type: T_STACK_TRACE, ConstantPool: true},
+		{Name: "objectClass", Type: T_CLASS, ConstantPool: true},
+		{Name: "weight", Type: T_LONG, ConstantPool: false},
+		{Name: "contextId", Type: T_LONG, ConstantPool: false},
+	},
+}
 var Type_jdk_JavaMonitorEnter = def.Class{
 	Name: "jdk.JavaMonitorEnter",
 	ID:   T_MONITOR_ENTER,

diff --git a/parser/parser.go b/parser/parser.go
@@ -51,6 +51,7 @@ type Parser struct {
 	ExecutionSample             types2.ExecutionSample
 	ObjectAllocationInNewTLAB   types2.ObjectAllocationInNewTLAB
 	ObjectAllocationOutsideTLAB types2.ObjectAllocationOutsideTLAB
+	ObjectAllocationSample      types2.ObjectAllocationSample
 	JavaMonitorEnter            types2.JavaMonitorEnter
 	ThreadPark                  types2.ThreadPark
 	LiveObject                  types2.LiveObject
@@ -80,6 +81,7 @@ type Parser struct {
 
 	bindAllocInNewTLAB   *types2.BindObjectAllocationInNewTLAB
 	bindAllocOutsideTLAB *types2.BindObjectAllocationOutsideTLAB
+	bindAllocSample      *types2.BindObjectAllocationSample
 	bindMonitorEnter     *types2.BindJavaMonitorEnter
 	bindThreadPark       *types2.BindThreadPark
 	bindLiveObject       *types2.BindLiveObject
@@ -153,6 +155,16 @@ func (p *Parser) ParseEvent() (def.TypeID, error) {
 			}
 			p.pos = pp + int(size)
 			return ttyp, nil
+		case p.TypeMap.T_ALLOC_SAMPLE:
+			if p.bindAllocSample == nil {
+				p.pos = pp + int(size) // skip
+			}
+			_, err := p.ObjectAllocationSample.Parse(p.buf[p.pos:], p.bindAllocSample, &p.TypeMap)
+			if err != nil {
+				return 0, err
+			}
+			p.pos = pp + int(size)
+			return ttyp, nil
 		case p.TypeMap.T_LIVE_OBJECT:
 			if p.bindLiveObject == nil {
 				p.pos = pp + int(size) // skip
@@ -513,6 +525,7 @@ func (p *Parser) checkTypes() error {
 	typeExecutionSample := p.TypeMap.NameMap["jdk.ExecutionSample"]
 	typeAllocInNewTLAB := p.TypeMap.NameMap["jdk.ObjectAllocationInNewTLAB"]
 	typeALlocOutsideTLAB := p.TypeMap.NameMap["jdk.ObjectAllocationOutsideTLAB"]
+	typeAllocSample := p.TypeMap.NameMap["jdk.ObjectAllocationSample"]
 	typeMonitorEnter := p.TypeMap.NameMap["jdk.JavaMonitorEnter"]
 	typeThreadPark := p.TypeMap.NameMap["jdk.ThreadPark"]
 	typeLiveObject := p.TypeMap.NameMap["profiler.LiveObject"]
@@ -541,7 +554,13 @@ func (p *Parser) checkTypes() error {
 		p.TypeMap.T_ALLOC_OUTSIDE_TLAB = -1
 		p.bindAllocOutsideTLAB = nil
 	}
-
+	if typeAllocSample != nil {
+		p.TypeMap.T_ALLOC_SAMPLE = typeAllocSample.ID
+		p.bindAllocSample = types2.NewBindObjectAllocationSample(typeAllocSample, &p.TypeMap)
+	} else {
+		p.TypeMap.T_ALLOC_SAMPLE = -1
+		p.bindAllocSample = nil
+	}
 	if typeMonitorEnter != nil {
 		p.TypeMap.T_MONITOR_ENTER = typeMonitorEnter.ID
 		p.bindMonitorEnter = types2.NewBindJavaMonitorEnter(typeMonitorEnter, &p.TypeMap)

diff --git a/..._16_180855_0_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz b/..._16_180855_0_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz
diff --git a/..._0_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz b/..._0_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz
diff --git a/...cess_cpu_cpu__nanoseconds_expected.txt.gz → ...cess_cpu_cpu__nanoseconds_expected.txt.gz b/...cess_cpu_cpu__nanoseconds_expected.txt.gz → ...cess_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...pu__nanoseconds_expected_collapsed.txt.gz → ...pu__nanoseconds_expected_collapsed.txt.gz b/...pu__nanoseconds_expected_collapsed.txt.gz → ...pu__nanoseconds_expected_collapsed.txt.gz
diff --git a/..._1_wall_wall__nanoseconds_expected.txt.gz → ..._2_wall_wall__nanoseconds_expected.txt.gz b/..._1_wall_wall__nanoseconds_expected.txt.gz → ..._2_wall_wall__nanoseconds_expected.txt.gz
diff --git a/...ll__nanoseconds_expected_collapsed.txt.gz → ...ll__nanoseconds_expected_collapsed.txt.gz b/...ll__nanoseconds_expected_collapsed.txt.gz → ...ll__nanoseconds_expected_collapsed.txt.gz
diff --git a/...tant-index_3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz b/...tant-index_3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz
diff --git a/..._3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz b/..._3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz
diff --git a/...cess_cpu_cpu__nanoseconds_expected.txt.gz → ...cess_cpu_cpu__nanoseconds_expected.txt.gz b/...cess_cpu_cpu__nanoseconds_expected.txt.gz → ...cess_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...pu__nanoseconds_expected_collapsed.txt.gz → ...pu__nanoseconds_expected_collapsed.txt.gz b/...pu__nanoseconds_expected_collapsed.txt.gz → ...pu__nanoseconds_expected_collapsed.txt.gz
diff --git a/...-type-zero_3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz b/...-type-zero_3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz
diff --git a/..._3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz b/..._3_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz
diff --git a/...cess_cpu_cpu__nanoseconds_expected.txt.gz → ...cess_cpu_cpu__nanoseconds_expected.txt.gz b/...cess_cpu_cpu__nanoseconds_expected.txt.gz → ...cess_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...pu__nanoseconds_expected_collapsed.txt.gz → ...pu__nanoseconds_expected_collapsed.txt.gz b/...pu__nanoseconds_expected_collapsed.txt.gz → ...pu__nanoseconds_expected_collapsed.txt.gz
diff --git a/parser/testdata/object-allocation-sample.jfr.gz b/parser/testdata/object-allocation-sample.jfr.gz
diff --git a/...ta/object-allocation-sample_0_block_contentions__count delay__nanoseconds_expected.txt.gz b/...ta/object-allocation-sample_0_block_contentions__count delay__nanoseconds_expected.txt.gz
diff --git a/...allocation-sample_0_block_contentions__count delay__nanoseconds_expected_collapsed.txt.gz b/...allocation-sample_0_block_contentions__count delay__nanoseconds_expected_collapsed.txt.gz
diff --git a/...ion-sample_1_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz b/...ion-sample_1_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected.txt.gz
diff --git a/..._1_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz b/..._1_memory_alloc_sample_objects__count alloc_sample_bytes__bytes_expected_collapsed.txt.gz
diff --git a/parser/testdata/object-allocation-sample_2_process_cpu_cpu__nanoseconds_expected.txt.gz b/parser/testdata/object-allocation-sample_2_process_cpu_cpu__nanoseconds_expected.txt.gz
diff --git a/...estdata/object-allocation-sample_2_process_cpu_cpu__nanoseconds_expected_collapsed.txt.gz b/...estdata/object-allocation-sample_2_process_cpu_cpu__nanoseconds_expected_collapsed.txt.gz