Pass in tenant_id to kv_store in monitoring job #3726
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
pablonyx
reviewed
Jan 20, 2025
Comment on lines
31
to
+34
| def __init__( | ||
| self, redis_client: Redis | None = None, tenant_id: str | None = None | ||
| ) -> None: | ||
| self.tenant_id = tenant_id or CURRENT_TENANT_ID_CONTEXTVAR.get() |
There was a problem hiding this comment.
Slightly wary of default None to the current tenant ID. Elsewhere, we treat it as a valid tenant ID / as POSTGRES_DEFAULT_SCHEMA. Had a similar debate around get_session_with_tenant (default to a sentinel if nothing passed in?, etc.) and ended up deciding on different entrypoint (get_session_with_default_tenant)
pablonyx
reviewed
Jan 20, 2025
| @@ -94,16 +94,16 @@ def optional_telemetry( | |||
| if DISABLE_TELEMETRY: | |||
| return | |||
|
|
|||
| tenant_id = tenant_id or CURRENT_TENANT_ID_CONTEXTVAR.get() | |||
pablonyx
approved these changes
Jan 20, 2025
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.
Description
We weren't passing in the right tenant ID for cloud-monitoring -> silent telemetry failures.
https://linear.app/danswer/issue/DAN-1296/fix-monitoring-telemetry-on-our-cloud
How Has This Been Tested?
kubectl cped the files over to the monitoring pod and ran:Then verified we got the expected packet on the telemetry server.
Backporting (check the box to trigger backport action)
Note: You have to check that the action passes, otherwise resolve the conflicts manually and tag the patches.