Skip to content

Commit

Permalink
Ignore samples with different values with same timestamp
Browse files Browse the repository at this point in the history
  • Loading branch information
proddata committed Aug 19, 2024
1 parent cbbd41d commit 6789176
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ CHANGES for CrateDB Prometheus Adapter
Unreleased
==========

- Changed the behavior to ignore samples with identical timestamps but different
values during ingestion. This change aligns with Prometheus' behavior, as
duplicates should not occur. However, since this enforcement is recent,
there may be setups with existing duplicates; thus, we now ignore them to
prevent errors.

2024-01-23 0.5.1
================
Expand Down
14 changes: 6 additions & 8 deletions crate.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/prometheus/common/model"
)

const crateWriteStatement = `INSERT INTO metrics ("labels", "labels_hash", "timestamp", "value", "valueRaw") VALUES ($1, $2, $3, $4, $5)`
const crateWriteStatement = `INSERT INTO metrics ("labels", "labels_hash", "timestamp", "value", "valueRaw") VALUES ($1, $2, $3, $4, $5) ON CONFLICT DO NOTHING`

type crateRow struct {
labels model.Metric
Expand Down Expand Up @@ -112,10 +112,9 @@ func newCrateEndpoint(ep *endpointConfig) *crateEndpoint {
}

func (c *crateEndpoint) endpoint() endpoint.Endpoint {
/**
* Initialize connection pools lazily here instead of in `newCrateEndpoint()`,
* so that the adapter does not crash on startup if the endpoint is unavailable.
**/

// Initialize connection pools lazily here instead of in `newCrateEndpoint()`,
// so that the adapter does not crash on startup if the endpoint is unavailable.
return func(ctx context.Context, request interface{}) (response interface{}, err error) {

// Initialize database connection pools.
Expand All @@ -134,9 +133,8 @@ func (c *crateEndpoint) endpoint() endpoint.Endpoint {
}

func (c *crateEndpoint) createPools(ctx context.Context) (err error) {
/**
* Initialize two connection pools, one for read/write each.
**/

// Initialize two connection pools, one for read/write each.
c.readPool, err = createPoolWithPoolSize(ctx, c.poolConf.Copy(), c.readPoolSize)
if c.readPool == nil {
c.readPool, err = createPoolWithPoolSize(ctx, c.poolConf.Copy(), c.readPoolSize)
Expand Down

0 comments on commit 6789176

Please sign in to comment.