-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Keep a pool of connections in postgresql module (#12603)
Reuse connections in PostgreSQL metricsets instead of opening and closing one on each fetch. Fixes #12504
- Loading branch information
Showing
7 changed files
with
139 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package postgresql | ||
|
|
||
| import ( | ||
| "context" | ||
| "database/sql" | ||
|
|
||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/elastic/beats/libbeat/logp" | ||
| "github.com/elastic/beats/metricbeat/mb" | ||
|
|
||
| // Register postgresql database/sql driver | ||
| _ "github.com/lib/pq" | ||
| ) | ||
|
|
||
| type MetricSet struct { | ||
| mb.BaseMetricSet | ||
|
|
||
| db *sql.DB | ||
| } | ||
|
|
||
| // NewMetricSet creates a PostgreSQL metricset with a pool of connections | ||
| func NewMetricSet(base mb.BaseMetricSet) (*MetricSet, error) { | ||
| return &MetricSet{BaseMetricSet: base}, nil | ||
| } | ||
|
|
||
| // DB creates a database connection, it must be freed after use with `Close()` | ||
| func (ms *MetricSet) DB(ctx context.Context) (*sql.Conn, error) { | ||
| if ms.db == nil { | ||
| db, err := sql.Open("postgres", ms.HostData().URI) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to open connection") | ||
| } | ||
| ms.db = db | ||
| } | ||
| return ms.db.Conn(ctx) | ||
| } | ||
|
|
||
| //QueryStats makes the database call for a given metric | ||
| func (ms *MetricSet) QueryStats(ctx context.Context, query string) ([]map[string]interface{}, error) { | ||
| db, err := ms.DB(ctx) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to obtain a connection with the database") | ||
| } | ||
| defer db.Close() | ||
|
|
||
| rows, err := db.QueryContext(ctx, query) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to query database") | ||
| } | ||
|
|
||
| columns, err := rows.Columns() | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "scanning columns") | ||
| } | ||
| vals := make([][]byte, len(columns)) | ||
| valPointers := make([]interface{}, len(columns)) | ||
| for i := range vals { | ||
| valPointers[i] = &vals[i] | ||
| } | ||
|
|
||
| results := []map[string]interface{}{} | ||
|
|
||
| for rows.Next() { | ||
| err = rows.Scan(valPointers...) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "scanning row") | ||
| } | ||
|
|
||
| result := map[string]interface{}{} | ||
| for i, col := range columns { | ||
| result[col] = string(vals[i]) | ||
| } | ||
|
|
||
| logp.Debug("postgresql", "Result: %v", result) | ||
| results = append(results, result) | ||
| } | ||
| return results, nil | ||
| } | ||
|
|
||
| // Close closes the metricset and its connections | ||
| func (ms *MetricSet) Close() error { | ||
| if ms.db == nil { | ||
| return nil | ||
| } | ||
| return errors.Wrap(ms.db.Close(), "failed to close connection") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters