feat: un-revert registration of db.sql metrics
#2373
Merged
Conversation
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
deniseli
requested review from
a team and
stuartwdouglas
and removed request for
a team
Open
github-merge-queue bot
pushed a commit
that referenced
this pull request
Aug 15, 2024
The ModuleContext was designed to be an abstract data model in the Controller for the resources required by a module, but along the way it started to be used for storing DB connections for use by the go-runtime. This change cleanly separates those requirements so that the go-runtime is entirely responsible for creating new connections from the DSN provided by the ModuleContext. I think there's a bit more work to be done here, in that the ModuleContext knows about testing in the go-runtime, which it really shouldn't, but this will unblock #2373 for now.
alecthomas
reviewed
Aug 15, 2024
| @@ -13,6 +13,7 @@ | |||
| package reflect | |||
|
|
|||
| import ( | |||
| "container/list" | |||
There was a problem hiding this comment.
Let's roll these reflection changes back, we shouldn't be copying a db.DB in the first place. I'll send a PR to rectify that.
There was a problem hiding this comment.
Excellent, thank you! Done
deniseli
force-pushed
the
dli/otelsql
branch
2 times, most recently
from
061a410 to
2b7b088
Compare
cleanup lint client_test.go temp go.mod cleanup undo project toml change integration test go.mod and go.sum testdata handle unsafe.pointer rm encryptors nuke reflect changes minus list.List
alecthomas
approved these changes
Aug 19, 2024
cmd/ftl-controller/main.go
Outdated
| conn, err := sql.Open("pgx", cli.ControllerConfig.DSN) | ||
| conn, err := otelsql.Open("pgx", cli.ControllerConfig.DSN) | ||
| kctx.FatalIfErrorf(err) | ||
| err = otelsql.RegisterDBStatsMetrics(conn, otelsql.WithAttributes(semconv.DBSystemPostgreSQL)) |
There was a problem hiding this comment.
Can we create a helper function that opens + instruments in one, and use that function in all these locations?
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2285
Unreverts #2305 with these changes:
copyAnychanges except for thelist.Listhandling.reflect: internal error: must be a Pointer or Ptr; got unsafe.PointerDeepCopy.reflect.Ptrrefs toreflect.Pointer. Not a big deal, butPtris the old name, and since we're usingreflect.Pointerelsewhere in this file, it's better to stay consistent. Accordingly, this also fixes the error message that we saw in the prod deployment, which previously impliedPointerandPtrwere two separate types.