Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
27 changes: 27 additions & 0 deletions .chloggen/pg-temp-bytes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: postgresqlreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add 'postgresql.temp.io' metric

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [41365]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: The metric emits the amount of data written to temporary files.

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
8 changes: 5 additions & 3 deletions receiver/postgresqlreceiver/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ type databaseStats struct {
transactionCommitted int64
transactionRollback int64
deadlocks int64
tempIo int64
tempFiles int64
tupUpdated int64
tupReturned int64
Expand All @@ -198,7 +199,7 @@ type databaseStats struct {

func (c *postgreSQLClient) getDatabaseStats(ctx context.Context, databases []string) (map[databaseName]databaseStats, error) {
query := filterQueryByDatabases(
"SELECT datname, xact_commit, xact_rollback, deadlocks, temp_files, tup_updated, tup_returned, tup_fetched, tup_inserted, tup_deleted, blks_hit, blks_read FROM pg_stat_database",
"SELECT datname, xact_commit, xact_rollback, deadlocks, temp_files, temp_bytes, tup_updated, tup_returned, tup_fetched, tup_inserted, tup_deleted, blks_hit, blks_read FROM pg_stat_database",
databases,
false,
)
Expand All @@ -213,8 +214,8 @@ func (c *postgreSQLClient) getDatabaseStats(ctx context.Context, databases []str

for rows.Next() {
var datname string
var transactionCommitted, transactionRollback, deadlocks, tempFiles, tupUpdated, tupReturned, tupFetched, tupInserted, tupDeleted, blksHit, blksRead int64
err = rows.Scan(&datname, &transactionCommitted, &transactionRollback, &deadlocks, &tempFiles, &tupUpdated, &tupReturned, &tupFetched, &tupInserted, &tupDeleted, &blksHit, &blksRead)
var transactionCommitted, transactionRollback, deadlocks, tempIo, tempFiles, tupUpdated, tupReturned, tupFetched, tupInserted, tupDeleted, blksHit, blksRead int64
err = rows.Scan(&datname, &transactionCommitted, &transactionRollback, &deadlocks, &tempIo, &tempFiles, &tupUpdated, &tupReturned, &tupFetched, &tupInserted, &tupDeleted, &blksHit, &blksRead)
if err != nil {
errs = multierr.Append(errs, err)
continue
Expand All @@ -224,6 +225,7 @@ func (c *postgreSQLClient) getDatabaseStats(ctx context.Context, databases []str
transactionCommitted: transactionCommitted,
transactionRollback: transactionRollback,
deadlocks: deadlocks,
tempIo: tempIo,
tempFiles: tempFiles,
tupUpdated: tupUpdated,
tupReturned: tupReturned,
Expand Down
8 changes: 8 additions & 0 deletions receiver/postgresqlreceiver/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,14 @@ The number of sequential scans.
| ---- | ----------- | ---------- | ----------------------- | --------- |
| {sequential_scan} | Sum | Int | Cumulative | true |

### postgresql.temp.io

Total amount of data written to temporary files by queries.

| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic |
| ---- | ----------- | ---------- | ----------------------- | --------- |
| By | Sum | Int | Cumulative | true |

### postgresql.temp_files

The number of temp files.
Expand Down
1 change: 1 addition & 0 deletions receiver/postgresqlreceiver/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ func integrationTest(name string, databases []string, pgVersion string) func(*te
rCfg.Insecure = true
rCfg.Metrics.PostgresqlWalDelay.Enabled = true
rCfg.Metrics.PostgresqlDeadlocks.Enabled = true
rCfg.Metrics.PostgresqlTempIo.Enabled = true
rCfg.Metrics.PostgresqlTempFiles.Enabled = true
rCfg.Metrics.PostgresqlTupUpdated.Enabled = true
rCfg.Metrics.PostgresqlTupReturned.Enabled = true
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ all_set:
enabled: true
postgresql.table.vacuum.count:
enabled: true
postgresql.temp.io:
enabled: true
postgresql.temp_files:
enabled: true
postgresql.tup_deleted:
Expand Down Expand Up @@ -135,6 +137,8 @@ none_set:
enabled: false
postgresql.table.vacuum.count:
enabled: false
postgresql.temp.io:
enabled: false
postgresql.temp_files:
enabled: false
postgresql.tup_deleted:
Expand Down
8 changes: 8 additions & 0 deletions receiver/postgresqlreceiver/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,14 @@ metrics:
value_type: int
monotonic: true
aggregation_temporality: cumulative
postgresql.temp.io:
enabled: false
description: Total amount of data written to temporary files by queries.
unit: By
sum:
value_type: int
monotonic: true
aggregation_temporality: cumulative
postgresql.wal.age:
description: Age of the oldest WAL file.
extended_documentation: |
Expand Down
1 change: 1 addition & 0 deletions receiver/postgresqlreceiver/scraper.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ func (p *postgreSQLScraper) recordDatabase(now pcommon.Timestamp, db string, r *
p.mb.RecordPostgresqlRollbacksDataPoint(now, stats.transactionRollback)
p.mb.RecordPostgresqlDeadlocksDataPoint(now, stats.deadlocks)
p.mb.RecordPostgresqlTempFilesDataPoint(now, stats.tempFiles)
p.mb.RecordPostgresqlTempIoDataPoint(now, stats.tempIo)
p.mb.RecordPostgresqlTupUpdatedDataPoint(now, stats.tupUpdated)
p.mb.RecordPostgresqlTupReturnedDataPoint(now, stats.tupReturned)
p.mb.RecordPostgresqlTupFetchedDataPoint(now, stats.tupFetched)
Expand Down
13 changes: 13 additions & 0 deletions receiver/postgresqlreceiver/scraper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ func TestScraper(t *testing.T) {
cfg.Metrics.PostgresqlWalDelay.Enabled = true
cfg.Metrics.PostgresqlDeadlocks.Enabled = true
cfg.Metrics.PostgresqlTempFiles.Enabled = true
cfg.Metrics.PostgresqlTempIo.Enabled = true
cfg.Metrics.PostgresqlTupUpdated.Enabled = true
cfg.Metrics.PostgresqlTupReturned.Enabled = true
cfg.Metrics.PostgresqlTupFetched.Enabled = true
Expand Down Expand Up @@ -97,6 +98,8 @@ func TestScraperNoDatabaseSingle(t *testing.T) {
cfg.Metrics.PostgresqlDeadlocks.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempFiles.Enabled)
cfg.Metrics.PostgresqlTempFiles.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempIo.Enabled)
cfg.Metrics.PostgresqlTempIo.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupUpdated.Enabled)
cfg.Metrics.PostgresqlTupUpdated.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupReturned.Enabled)
Expand Down Expand Up @@ -130,6 +133,7 @@ func TestScraperNoDatabaseSingle(t *testing.T) {
cfg.Metrics.PostgresqlWalDelay.Enabled = false
cfg.Metrics.PostgresqlDeadlocks.Enabled = false
cfg.Metrics.PostgresqlTempFiles.Enabled = false
cfg.Metrics.PostgresqlTempIo.Enabled = false
cfg.Metrics.PostgresqlTupUpdated.Enabled = false
cfg.Metrics.PostgresqlTupReturned.Enabled = false
cfg.Metrics.PostgresqlTupFetched.Enabled = false
Expand Down Expand Up @@ -172,6 +176,8 @@ func TestScraperNoDatabaseMultipleWithoutPreciseLag(t *testing.T) {
cfg.Metrics.PostgresqlDeadlocks.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempFiles.Enabled)
cfg.Metrics.PostgresqlTempFiles.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempIo.Enabled)
cfg.Metrics.PostgresqlTempIo.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupUpdated.Enabled)
cfg.Metrics.PostgresqlTupUpdated.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupReturned.Enabled)
Expand Down Expand Up @@ -223,6 +229,8 @@ func TestScraperNoDatabaseMultiple(t *testing.T) {
cfg.Metrics.PostgresqlDeadlocks.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempFiles.Enabled)
cfg.Metrics.PostgresqlTempFiles.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempIo.Enabled)
cfg.Metrics.PostgresqlTempIo.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupUpdated.Enabled)
cfg.Metrics.PostgresqlTupUpdated.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupReturned.Enabled)
Expand Down Expand Up @@ -274,6 +282,8 @@ func TestScraperWithResourceAttributeFeatureGate(t *testing.T) {
cfg.Metrics.PostgresqlDeadlocks.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempFiles.Enabled)
cfg.Metrics.PostgresqlTempFiles.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempIo.Enabled)
cfg.Metrics.PostgresqlTempIo.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupUpdated.Enabled)
cfg.Metrics.PostgresqlTupUpdated.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupReturned.Enabled)
Expand Down Expand Up @@ -326,6 +336,8 @@ func TestScraperWithResourceAttributeFeatureGateSingle(t *testing.T) {
cfg.Metrics.PostgresqlDeadlocks.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempFiles.Enabled)
cfg.Metrics.PostgresqlTempFiles.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTempIo.Enabled)
cfg.Metrics.PostgresqlTempIo.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupUpdated.Enabled)
cfg.Metrics.PostgresqlTupUpdated.Enabled = true
require.False(t, cfg.Metrics.PostgresqlTupReturned.Enabled)
Expand Down Expand Up @@ -656,6 +668,7 @@ func (m *mockClient) initMocks(database string, schema string, databases []strin
tupDeleted: int64(idx + 9),
blksHit: int64(idx + 10),
blksRead: int64(idx + 11),
tempIo: int64(idx + 12),
}
dbSize[databaseName(db)] = int64(idx + 4)
backends[databaseName(db)] = int64(idx + 3)
Expand Down
Loading