From d6d97f3855ed221ba3c1955195f55661e0ef41fa Mon Sep 17 00:00:00 2001 From: Robin Huang Date: Mon, 20 Jan 2025 11:22:29 -0800 Subject: [PATCH] Revert "Add new relic postgres datastore." This reverts commit 40780a82bee9de10b400e7acfcb92cc102d6bd03. --- go.mod | 1 - go.sum | 4 ---- main.go | 4 ++-- server/server.go | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 6590035..9d48f01 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,6 @@ require ( github.com/moby/term v0.5.0 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/morikuni/aec v1.0.0 // indirect - github.com/newrelic/go-agent/v3/integrations/nrpq v1.1.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc5 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect diff --git a/go.sum b/go.sum index dd9da61..21c92e8 100644 --- a/go.sum +++ b/go.sum @@ -180,7 +180,6 @@ github.com/labstack/echo/v4 v4.11.4 h1:vDZmA+qNeh1pd/cCkEicDMrjtrnMGQ1QFI9gWN1zG github.com/labstack/echo/v4 v4.11.4/go.mod h1:noh7EvLwqDsmh/X/HWKPUl1AjzJrhyptRyEbQJfxen8= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= -github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= @@ -213,13 +212,10 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/newrelic/go-agent/v3 v3.3.0/go.mod h1:H28zDNUC0U/b7kLoY4EFOhuth10Xu/9dchozUiOseQQ= github.com/newrelic/go-agent/v3 v3.36.0 h1:PdvJZiUu45qg2qrOeia0gYr1vaZ2Ro6QIlqlgHObHXo= github.com/newrelic/go-agent/v3 v3.36.0/go.mod h1:GNTda53CohAhkgsc7/gqSsJhDZjj8vaky5u+vKz7wqM= github.com/newrelic/go-agent/v3/integrations/nrecho-v4 v1.1.3 h1:+p/67kyG/ySqYgbSFn5kmfj/scWhGycNefT8QEbPS/w= github.com/newrelic/go-agent/v3/integrations/nrecho-v4 v1.1.3/go.mod h1:ANGVlWG7HgaLvW3npXhu074jiSB4dA6HAux/fmVTvJE= -github.com/newrelic/go-agent/v3/integrations/nrpq v1.1.1 h1:HlVcLXw7ZZPjeRx3lQUAN8qfpJVDmuq4L237M1+PS8A= -github.com/newrelic/go-agent/v3/integrations/nrpq v1.1.1/go.mod h1:UvI7Z0Dok/36E44UiTysh9HQZudDdpiChbe3+eqSB0I= github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= diff --git a/main.go b/main.go index c1e41d5..12ff77c 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ import ( "github.com/rs/zerolog/log" - _ "github.com/newrelic/go-agent/v3/integrations/nrpq" + _ "github.com/lib/pq" ) // validateEnvVars ensures all required environment variables are set based on the environment. @@ -104,7 +104,7 @@ func main() { } // Initialize the database client - client, err := ent.Open("nrpostgres", dsn) + client, err := ent.Open("postgres", dsn) if err != nil { log.Fatal().Err(err).Msg("Failed to establish a connection to the PostgreSQL database.") } diff --git a/server/server.go b/server/server.go index ab2dbaf..e1a09a9 100644 --- a/server/server.go +++ b/server/server.go @@ -54,7 +54,6 @@ func NewServer(client *ent.Client, config *config.Config) (*Server, error) { newrelic.ConfigAppLogForwardingEnabled(true), newrelic.ConfigDebugLogger(log.Logger), newrelic.ConfigDistributedTracerEnabled(true), - newrelic.ConfigDatastoreRawQuery(true), newrelic.ConfigEnabled(true), )