time mocker

DataDog · Jun 24, 2024 · c4a7dfe · c4a7dfe
1 parent 928bb43
commit c4a7dfe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/pkg/collector/corechecks/oracle/init.go b/pkg/collector/corechecks/oracle/init.go
@@ -13,6 +13,7 @@ import (
 	"strings"
 
 	"github.com/DataDog/datadog-agent/pkg/util/log"
+	"github.com/benbjohnson/clock"
 )
 
 type vInstance struct {
@@ -150,6 +151,7 @@ func (c *Check) init() error {
 
 	c.fqtEmitted = getFqtEmittedCache()
 	c.planEmitted = getPlanEmittedCache(c)
+	c.clock = clock.New()
 	c.initialized = true
 
 	return nil

diff --git a/pkg/collector/corechecks/oracle/locks.go b/pkg/collector/corechecks/oracle/locks.go
@@ -14,7 +14,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/DataDog/datadog-agent/pkg/util/hostname"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
@@ -138,10 +137,11 @@ func (c *Check) locks() error {
 	}
 
 	hname, _ := hostname.Get(context.TODO())
+	ts := float64(c.clock.Now().UnixMilli())
 	m := metricsPayload{
 		Host:                  c.dbHostname,
 		Kind:                  "lock_metrics",
-		Timestamp:             float64(time.Now().UnixMilli()),
+		Timestamp:             ts,
 		MinCollectionInterval: float64(c.config.MinCollectionInterval),
 		Tags:                  c.tags,
 		AgentVersion:          c.agentVersion,

diff --git a/pkg/collector/corechecks/oracle/locks_test.go b/pkg/collector/corechecks/oracle/locks_test.go
@@ -16,6 +16,7 @@ import (
 
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/DataDog/datadog-agent/pkg/util/hostname"
+	"github.com/benbjohnson/clock"
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
@@ -63,6 +64,10 @@ func TestLocks(t *testing.T) {
 	rows := sqlmock.NewRows([]string{"SECONDS", "PROGRAM"}).
 		AddRow(17, "test-program")
 	dbMock.ExpectQuery("SELECT.*transaction.*").WillReturnRows(rows)
+	mockClock := clock.NewMock()
+	mockClock.Set(time.Now())
+	c.clock = mockClock
+	ts := float64(c.clock.Now().UnixMilli())
 	err = c.locks()
 	assert.NoError(t, err, "failed to execute locks query")
 	payload := lockMetricsPayload{
@@ -73,6 +78,7 @@ func TestLocks(t *testing.T) {
 			},
 		},
 	}
+	m.Timestamp = ts
 	payload.metricsPayload = m
 	payloadBytes, err = json.Marshal(payload)
 	require.NoError(t, err, "failed to marshal lock metrics payload")

diff --git a/pkg/collector/corechecks/oracle/oracle.go b/pkg/collector/corechecks/oracle/oracle.go
@@ -27,6 +27,7 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 	"github.com/DataDog/datadog-agent/pkg/util/optional"
 	"github.com/DataDog/datadog-agent/pkg/version"
+	"github.com/benbjohnson/clock"
 
 	//nolint:revive // TODO(DBM) Fix revive linter
 	_ "github.com/godror/godror"
@@ -113,6 +114,7 @@ type Check struct {
 	databaseRole                            string
 	openMode                                string
 	legacyIntegrationCompatibilityMode      bool
+	clock                                   clock.Clock
 }
 
 type vDatabase struct {