CDRIVER-5638 Record both FaaS and container metadata when both are present #2016
Conversation
This file contains hidden or 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
kevinAlbs
approved these changes
May 29, 2025
Comment on lines
+660
to
+664
| bson_iter_t iter; | ||
| ASSERT (bson_iter_init (&iter, doc)); | ||
| ASSERT (bson_iter_find_descendant (&iter, "container.orchestrator", &iter)); | ||
| ASSERT (BSON_ITER_HOLDS_UTF8 (&iter)); | ||
| ASSERT (strcmp ("kubernetes", bson_iter_utf8 (&iter, NULL)) == 0); |
There was a problem hiding this comment.
Suggested change
| bson_iter_t iter; | |
| ASSERT (bson_iter_init (&iter, doc)); | |
| ASSERT (bson_iter_find_descendant (&iter, "container.orchestrator", &iter)); | |
| ASSERT (BSON_ITER_HOLDS_UTF8 (&iter)); | |
| ASSERT (strcmp ("kubernetes", bson_iter_utf8 (&iter, NULL)) == 0); | |
| ASSERT_CMPSTR (bson_lookup_utf8 (doc, "container.orchestrator"), "kubernetes"); | |
| ASSERT_CMPSTR (bson_lookup_utf8 (doc, "env.name"), "aws.lambda"); |
Suggest simplifying with the test helper bson_lookup_utf8. Suggest checking env.name is set to aws.lambda (to check both aws and container fields are set).
Comment on lines
+374
to
+377
| handshake->docker = false; | ||
| #ifdef _POSIX_VERSION | ||
| handshake->docker = (access ("/.dockerenv", F_OK) == 0); | ||
| #endif |
There was a problem hiding this comment.
Is a separate check needed if the Docker container is running Windows? Example:
#ifdef _WIN32
handshake->docker = (_access_s ("C:\\.dockerenv", 0) == 0);
#else
handshake->docker = (access ("/.dockerenv", F_OK) == 0);
#endifOn non-Windows, I expect access can be assumed to be available since POSIX features are enabled.
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.
Add environment variable checks for being in both a container and FaaS environment. Add that info to the handshake document. Sync spec test.