Skip to content

Commit c9e5ec8

Browse files
apiarian-datadogapiarian-datadog
authored
chore: switch warning to debug for dynamo span pointers (#12763)
## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
1 parent bcd7147 commit c9e5ec8

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

‎ddtrace/_trace/utils_botocore/span_pointers/dynamodb.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def _extract_primary_key_names_from_configuration(
233233
try:
234234
return dynamodb_primary_key_names_for_tables[table_name]
235235
except KeyError as e:
236-
log.warning(
236+
log.debug(
237237
"span pointers: failed to extract %s span pointer: table %s not found in primary key names; "
238238
"Please set them through ddtrace.config.botocore['dynamodb_primary_key_names_for_tables'] or "
239239
"DD_BOTOCORE_DYNAMODB_TABLE_PRIMARY_KEYS",

‎tests/tracer/utils_botocore/test_span_pointers.py‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ class PointersCase(NamedTuple):
165165
response: dict
166166
expected_pointers: List[_SpanPointerDescription]
167167
expected_logger_regex: Optional[str]
168-
logger_level: str
169168

170169
@pytest.mark.parametrize(
171170
"pointers_case",
@@ -178,7 +177,6 @@ class PointersCase(NamedTuple):
178177
response={},
179178
expected_pointers=[],
180179
expected_logger_regex=None,
181-
logger_level="debug",
182180
),
183181
PointersCase(
184182
name="unknown s3 operation",
@@ -188,7 +186,6 @@ class PointersCase(NamedTuple):
188186
response={},
189187
expected_pointers=[],
190188
expected_logger_regex=None,
191-
logger_level="debug",
192189
),
193190
PointersCase(
194191
name="malformed s3.PutObject, missing bucket",
@@ -202,7 +199,6 @@ class PointersCase(NamedTuple):
202199
},
203200
expected_pointers=[],
204201
expected_logger_regex=r"span pointers: problem with parameters for S3.PutObject .*: 'Bucket'",
205-
logger_level="debug",
206202
),
207203
PointersCase(
208204
name="malformed s3.PutObject, missing key",
@@ -216,7 +212,6 @@ class PointersCase(NamedTuple):
216212
},
217213
expected_pointers=[],
218214
expected_logger_regex=r"span pointers: problem with parameters for S3.PutObject .*: 'Key'",
219-
logger_level="debug",
220215
),
221216
PointersCase(
222217
name="malformed s3.PutObject, missing etag",
@@ -229,7 +224,6 @@ class PointersCase(NamedTuple):
229224
response={},
230225
expected_pointers=[],
231226
expected_logger_regex=r"span pointers: problem with parameters for S3.PutObject .*: 'ETag'",
232-
logger_level="debug",
233227
),
234228
PointersCase(
235229
name="malformed s3.PutObject, impossible non-ascii bucket",
@@ -244,7 +238,6 @@ class PointersCase(NamedTuple):
244238
},
245239
expected_pointers=[],
246240
expected_logger_regex=r".*'ascii' codec can't encode characters.*",
247-
logger_level="debug",
248241
),
249242
PointersCase(
250243
name="s3.PutObject",
@@ -266,7 +259,6 @@ class PointersCase(NamedTuple):
266259
),
267260
],
268261
expected_logger_regex=None,
269-
logger_level="debug",
270262
),
271263
PointersCase(
272264
name="s3.PutObject with double quoted ETag",
@@ -289,7 +281,6 @@ class PointersCase(NamedTuple):
289281
),
290282
],
291283
expected_logger_regex=None,
292-
logger_level="debug",
293284
),
294285
PointersCase(
295286
name="s3.CopyObject",
@@ -313,7 +304,6 @@ class PointersCase(NamedTuple):
313304
),
314305
],
315306
expected_logger_regex=None,
316-
logger_level="debug",
317307
),
318308
PointersCase(
319309
name="s3.CopyObject with double quoted ETag",
@@ -337,7 +327,6 @@ class PointersCase(NamedTuple):
337327
),
338328
],
339329
expected_logger_regex=None,
340-
logger_level="debug",
341330
),
342331
PointersCase(
343332
name="s3.CompleteMultipartUpload",
@@ -359,7 +348,6 @@ class PointersCase(NamedTuple):
359348
),
360349
],
361350
expected_logger_regex=None,
362-
logger_level="debug",
363351
),
364352
PointersCase(
365353
name="s3.CompleteMultipartUpload with double quoted ETag",
@@ -382,7 +370,6 @@ class PointersCase(NamedTuple):
382370
),
383371
],
384372
expected_logger_regex=None,
385-
logger_level="debug",
386373
),
387374
PointersCase(
388375
name="dynamodb.PutItem",
@@ -406,7 +393,6 @@ class PointersCase(NamedTuple):
406393
),
407394
],
408395
expected_logger_regex=None,
409-
logger_level="debug",
410396
),
411397
PointersCase(
412398
name="dynamodb.PutItem deserialized",
@@ -430,7 +416,6 @@ class PointersCase(NamedTuple):
430416
),
431417
],
432418
expected_logger_regex=None,
433-
logger_level="debug",
434419
),
435420
PointersCase(
436421
name="dynamodb.PutItem with extra data",
@@ -455,7 +440,6 @@ class PointersCase(NamedTuple):
455440
),
456441
],
457442
expected_logger_regex=None,
458-
logger_level="debug",
459443
),
460444
PointersCase(
461445
name="dynamodb.PutItem unknown table",
@@ -472,7 +456,6 @@ class PointersCase(NamedTuple):
472456
},
473457
expected_pointers=[],
474458
expected_logger_regex=".*unknown-table.*",
475-
logger_level="warning",
476459
),
477460
PointersCase(
478461
name="dynamodb.PutItem missing primary key",
@@ -489,7 +472,6 @@ class PointersCase(NamedTuple):
489472
},
490473
expected_pointers=[],
491474
expected_logger_regex=".*missing primary key field: some-key",
492-
logger_level="debug",
493475
),
494476
PointersCase(
495477
name="dynamodb.UpdateItem",
@@ -513,7 +495,6 @@ class PointersCase(NamedTuple):
513495
),
514496
],
515497
expected_logger_regex=None,
516-
logger_level="debug",
517498
),
518499
PointersCase(
519500
name="dynamodb.UpdateItem deserialized",
@@ -537,7 +518,6 @@ class PointersCase(NamedTuple):
537518
),
538519
],
539520
expected_logger_regex=None,
540-
logger_level="debug",
541521
),
542522
PointersCase(
543523
name="dynamodb.UpdateItem table does not need to be known",
@@ -561,7 +541,6 @@ class PointersCase(NamedTuple):
561541
),
562542
],
563543
expected_logger_regex=None,
564-
logger_level="debug",
565544
),
566545
PointersCase(
567546
name="dynamodb.UpdateItem with two key attributes",
@@ -586,7 +565,6 @@ class PointersCase(NamedTuple):
586565
),
587566
],
588567
expected_logger_regex=None,
589-
logger_level="debug",
590568
),
591569
PointersCase(
592570
name="dynamodb.UpdateItem with three keys, impossibly",
@@ -605,7 +583,6 @@ class PointersCase(NamedTuple):
605583
},
606584
expected_pointers=[],
607585
expected_logger_regex=".*unexpected number of primary key fields: 3",
608-
logger_level="debug",
609586
),
610587
PointersCase(
611588
name="dynamodb.UpdateItem missing the key",
@@ -619,7 +596,6 @@ class PointersCase(NamedTuple):
619596
},
620597
expected_pointers=[],
621598
expected_logger_regex=".*'Key'.*",
622-
logger_level="debug",
623599
),
624600
PointersCase(
625601
name="dynamodb.DeleteItem",
@@ -643,7 +619,6 @@ class PointersCase(NamedTuple):
643619
),
644620
],
645621
expected_logger_regex=None,
646-
logger_level="debug",
647622
),
648623
PointersCase(
649624
name="dynamodb.DeleteItem deserialized",
@@ -667,7 +642,6 @@ class PointersCase(NamedTuple):
667642
),
668643
],
669644
expected_logger_regex=None,
670-
logger_level="debug",
671645
),
672646
PointersCase(
673647
name="dynamodb.DeleteItem table does not need to be known",
@@ -691,7 +665,6 @@ class PointersCase(NamedTuple):
691665
),
692666
],
693667
expected_logger_regex=None,
694-
logger_level="debug",
695668
),
696669
PointersCase(
697670
name="dynamodb.DeleteItem with two key attributes",
@@ -716,7 +689,6 @@ class PointersCase(NamedTuple):
716689
),
717690
],
718691
expected_logger_regex=None,
719-
logger_level="debug",
720692
),
721693
PointersCase(
722694
name="dynamodb.DeleteItem with three keys, impossibly",
@@ -735,7 +707,6 @@ class PointersCase(NamedTuple):
735707
},
736708
expected_pointers=[],
737709
expected_logger_regex=".*unexpected number of primary key fields: 3",
738-
logger_level="debug",
739710
),
740711
PointersCase(
741712
name="dynamodb.DeleteItem missing the key",
@@ -749,7 +720,6 @@ class PointersCase(NamedTuple):
749720
},
750721
expected_pointers=[],
751722
expected_logger_regex=".*'Key'.*",
752-
logger_level="debug",
753723
),
754724
PointersCase(
755725
name="dynamodb.BatchWriteItem works with multiple items and tables",
@@ -828,7 +798,6 @@ class PointersCase(NamedTuple):
828798
),
829799
],
830800
expected_logger_regex=None,
831-
logger_level="debug",
832801
),
833802
PointersCase(
834803
name="dynamodb.BatchWriteItem works with multiple items and tables serialized",
@@ -907,7 +876,6 @@ class PointersCase(NamedTuple):
907876
),
908877
],
909878
expected_logger_regex=None,
910-
logger_level="debug",
911879
),
912880
PointersCase(
913881
name="dynamodb.BatchWriteItem still needs the mapping sometimes",
@@ -929,7 +897,6 @@ class PointersCase(NamedTuple):
929897
response={},
930898
expected_pointers=[],
931899
expected_logger_regex=".*unknown-table.*",
932-
logger_level="warning",
933900
),
934901
PointersCase(
935902
name="dynamodb.TransactWriteItems basic case",
@@ -999,7 +966,6 @@ class PointersCase(NamedTuple):
999966
),
1000967
],
1001968
expected_logger_regex=None,
1002-
logger_level="debug",
1003969
),
1004970
PointersCase(
1005971
name="dynamodb.TransactWriteItems basic case deserialized",
@@ -1069,7 +1035,6 @@ class PointersCase(NamedTuple):
10691035
),
10701036
],
10711037
expected_logger_regex=None,
1072-
logger_level="debug",
10731038
),
10741039
PointersCase(
10751040
name="dynamodb.TransactWriteItems still needs the mapping sometimes",
@@ -1090,7 +1055,6 @@ class PointersCase(NamedTuple):
10901055
response={},
10911056
expected_pointers=[],
10921057
expected_logger_regex=".*unknown-table.*",
1093-
logger_level="warning",
10941058
),
10951059
],
10961060
ids=lambda case: case.name,
@@ -1099,7 +1063,7 @@ def test_pointers(self, pointers_case: PointersCase) -> None:
10991063
# We might like to use caplog here but it resulted in inconsistent test
11001064
# behavior, so we have to go a bit deeper.
11011065

1102-
with mock.patch.object(logging.Logger, pointers_case.logger_level) as mock_logger:
1066+
with mock.patch.object(logging.Logger, "debug") as mock_logger:
11031067
assert sorted(
11041068
extract_span_pointers_from_successful_botocore_response(
11051069
dynamodb_primary_key_names_for_tables={

0 commit comments

Comments
 (0)