Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cmd/benchmark/benchmark.go
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func runCmd(cmd *cobra.Command, args []string) error {
var tables []table.TableDefinition
// add system summary table if not disabled
if !flagNoSystemSummary {
tables = append(tables, common.TableDefinitions[common.BriefSysSummaryTableName])
tables = append(tables, common.TableDefinitions[common.SystemSummaryTableName])
}
// add benchmark tables
selectedBenchmarkCount := 0
Expand Down
2 changes: 1 addition & 1 deletion cmd/flamegraph/flamegraph.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func validateFlags(cmd *cobra.Command, args []string) error {
func runCmd(cmd *cobra.Command, args []string) error {
var tables []table.TableDefinition
if !flagNoSystemSummary {
tables = append(tables, common.TableDefinitions[common.BriefSysSummaryTableName])
tables = append(tables, common.TableDefinitions[common.SystemSummaryTableName])
}
tables = append(tables, tableDefinitions[CallStackFrequencyTableName])
reportingCommand := common.ReportingCommand{
Expand Down
2 changes: 1 addition & 1 deletion cmd/lock/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func pullDataFiles(appContext common.AppContext, scriptOutputs map[string]script
func runCmd(cmd *cobra.Command, args []string) error {
var tables []table.TableDefinition
if !flagNoSystemSummary {
tables = append(tables, common.TableDefinitions[common.BriefSysSummaryTableName])
tables = append(tables, common.TableDefinitions[common.SystemSummaryTableName])
}
tables = append(tables, tableDefinitions[KernelLockAnalysisTableName])
reportingCommand := common.ReportingCommand{
Expand Down
8 changes: 4 additions & 4 deletions cmd/metrics/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (c *X86MetadataCollector) CollectMetadata(t target.Target, noRoot bool, noS
return Metadata{}, fmt.Errorf("failed to get system summary: %w", err)
}
} else {
metadata.SystemSummaryFields = [][]string{{"", "System Info Not Available"}}
metadata.SystemSummaryFields = [][]string{{"", "System Summary Not Available"}}
}
// Architecture
if metadata.Architecture, err = getArchitecture(scriptOutputs); err != nil {
Expand Down Expand Up @@ -352,7 +352,7 @@ func (c *ARMMetadataCollector) CollectMetadata(t target.Target, noRoot bool, noS
return Metadata{}, fmt.Errorf("failed to get system summary: %w", err)
}
} else {
metadata.SystemSummaryFields = [][]string{{"", "System Info Not Available"}}
metadata.SystemSummaryFields = [][]string{{"", "System Summary Not Available"}}
}
// Architecture
if metadata.Architecture, err = getArchitecture(scriptOutputs); err != nil {
Expand Down Expand Up @@ -555,7 +555,7 @@ BEGIN {
}
// add the system summary table scripts to the list
if !noSystemSummary {
for _, scriptName := range common.TableDefinitions[common.BriefSysSummaryTableName].ScriptNames {
for _, scriptName := range common.TableDefinitions[common.SystemSummaryTableName].ScriptNames {
scriptDef := script.GetScriptByName(scriptName)
metadataScripts = append(metadataScripts, scriptDef)
}
Expand Down Expand Up @@ -637,7 +637,7 @@ func ReadJSONFromFile(path string) (md Metadata, err error) {

// getSystemSummary - retrieves the system summary from the target
func getSystemSummary(scriptOutputs map[string]script.ScriptOutput) (summaryFields [][]string, err error) {
allTableValues, err := table.ProcessTables([]table.TableDefinition{common.TableDefinitions[common.BriefSysSummaryTableName]}, scriptOutputs)
allTableValues, err := table.ProcessTables([]table.TableDefinition{common.TableDefinitions[common.SystemSummaryTableName]}, scriptOutputs)
if err != nil {
err = fmt.Errorf("failed to process script outputs: %w", err)
return
Expand Down
6 changes: 3 additions & 3 deletions cmd/metrics/resources/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
const [hasHighlightedMetrics, setHasHighlightedMetrics] = React.useState(false);
const description = <<.DESCRIPTION>>
const metadata = <<.METADATA>>
const system_info = <<.SYSTEMINFO>>
const system_summary = <<.SYSTEMSUMMARY>>

// Check for highlighted metrics whenever current_metrics changes
React.useEffect(() => {
Expand Down Expand Up @@ -701,7 +701,7 @@
<Tab label="Memory" />
<Tab label="Power" />
<Tab label="All Metrics" />
<Tab label="System Info" />
<Tab label="System Summary" />
<Tab label="Metadata" />
</Tabs>
</Box>
Expand Down Expand Up @@ -967,7 +967,7 @@
</TableRow>
</TableHead>
<TableBody>
{system_info && system_info.map(([key, value]) => (
{system_summary && system_summary.map(([key, value]) => (
<TableRow key={key}>
<TableCell sx={{ fontFamily: 'Monospace' }} component="th" scope="row" >
{JSON.stringify(key)}
Expand Down
6 changes: 3 additions & 3 deletions cmd/metrics/summary.go
Original file line number Diff line number Diff line change
Expand Up @@ -629,12 +629,12 @@ func (mg *MetricGroup) loadHTMLTemplateValues(metadata Metadata, metricDefinitio
}
templateVals["METADATA"] = string(jsonMetadata)

// system info tab
jsonSystemInfo, err := json.Marshal(metadata.SystemSummaryFields)
// system summary tab
jsonSystemSummary, err := json.Marshal(metadata.SystemSummaryFields)
if err != nil {
return
}
templateVals["SYSTEMINFO"] = string(jsonSystemInfo)
templateVals["SYSTEMSUMMARY"] = string(jsonSystemSummary)
return
}

Expand Down
18 changes: 9 additions & 9 deletions cmd/metrics/trim.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,9 @@ func loadMetadataFromHTMLSummary(summaryHTMLPath string) (Metadata, error) {
return metadata, fmt.Errorf("failed to read summary HTML file: %w", err)
}

// assumes system_info comes after metadata in the file
// assumes system_summary comes after metadata in the file
const metadataPrefix = "const metadata = "
const systemInfoPrefix = "const system_info = "
const systemSummaryPrefix = "const system_summary = "
for line := range strings.SplitSeq(string(content), "\n") {
line = strings.TrimSpace(line)
if strings.HasPrefix(line, metadataPrefix) {
Expand All @@ -327,16 +327,16 @@ func loadMetadataFromHTMLSummary(summaryHTMLPath string) (Metadata, error) {
if err != nil {
return metadata, fmt.Errorf("failed to parse metadata JSON: %w", err)
}
} else if strings.HasPrefix(line, systemInfoPrefix) {
// system info
var systemInfo [][]string
jsonStart := len(systemInfoPrefix)
} else if strings.HasPrefix(line, systemSummaryPrefix) {
// system summary
var systemSummary [][]string
jsonStart := len(systemSummaryPrefix)
jsonString := strings.TrimSpace(line[jsonStart:])
err = json.Unmarshal([]byte(jsonString), &systemInfo)
err = json.Unmarshal([]byte(jsonString), &systemSummary)
if err != nil {
return metadata, fmt.Errorf("failed to parse system info JSON: %w", err)
return metadata, fmt.Errorf("failed to parse system summary JSON: %w", err)
}
metadata.SystemSummaryFields = systemInfo
metadata.SystemSummaryFields = systemSummary
return metadata, nil
}
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/telemetry/telemetry.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func runCmd(cmd *cobra.Command, args []string) error {
var tables []table.TableDefinition
// add system summary table if not disabled
if !flagNoSystemSummary {
tables = append(tables, common.TableDefinitions[common.BriefSysSummaryTableName])
tables = append(tables, common.TableDefinitions[common.SystemSummaryTableName])
}
// add category tables
for _, cat := range categories {
Expand Down
8 changes: 4 additions & 4 deletions internal/common/table_defs.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"strings"
)

const BriefSysSummaryTableName = "Brief System Summary"
const SystemSummaryTableName = "System Summary"

var TableDefinitions = map[string]table.TableDefinition{
BriefSysSummaryTableName: {
Name: BriefSysSummaryTableName,
MenuLabel: BriefSysSummaryTableName,
SystemSummaryTableName: {
Name: SystemSummaryTableName,
MenuLabel: SystemSummaryTableName,
HasRows: false,
ScriptNames: []string{
script.HostnameScriptName,
Expand Down