Skip to content

Commit d2f2aba

Browse files
andrewlockandrewlock
authored
Try to fix flake by using unique keys in StackExchange sample tests (#7359)
## Summary of changes Try to fix flake by using unique keys in StackExchange sample tests ## Reason for change Saw some flake in the stackexchange tests, with a diff looking like this: ```diff { TraceId: Id_107, SpanId: Id_108, Name: redis.command, Resource: HINCRBYFLOAT, Service: Samples.StackExchange.Redis, Type: redis, + Error: 1, Tags: { component: StackExchangeRedis, env: integration_tests, + error.msg: ERR hash value is not a float, + error.stack: + StackExchange.Redis.RedisServerException: ERR hash value is not a float + at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message, ResultProcessor`1 processor, ServerEndPoint server, T defaultValue), + error.type: StackExchange.Redis.RedisServerException, language: dotnet, out.host: stackexchangeredis, out.port: 6379, peer.service: stackexchangeredis, redis.raw_command: HINCRBYFLOAT StackExchange.Redis.Database.Hash, runtime-id: Guid_1, span.kind: client, version: 1.0.0, _dd.peer.service.source: out.host }, Metrics: { db.redis.database_index: 1.0, process_id: 0, _dd.top_level: 1.0, _dd.tracer_kr: 1.0, _sampling_priority_v1: 1.0 } }, ``` I _think_ the problem is that we are performing multiple operations against the same hash in the "sync" tests, and some ordering of commands it didn't like ## Implementation details Use a unique command for each test, like we do in the async version ## Test coverage Covered by existing ## Other details Originally failed [here](https://dev.azure.com/datadoghq/dd-trace-dotnet/_build/results?buildId=185286&view=logs&j=a69d05c5-a1c4-5b6f-4792-656fb54d97d4&t=7f0459b0-1f69-5432-c3d8-9b1decfa9496) <!-- ⚠️ Note: Where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. MergeQueue is NOT enabled in this repository. If you have write access to the repo, the PR has 1-2 approvals (see above), and all of the required checks have passed, you can use the Squash and Merge button to merge the PR. If you don't have write access, or you need help, reach out in the #apm-dotnet channel in Slack. -->
1 parent c92d71a commit d2f2aba

7 files changed

+117
-117
lines changed

‎tracer/test/snapshots/StackExchangeRedisTests.Latest.SchemaV0.verified.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[
1+
[
22
{
33
TraceId: Id_1,
44
SpanId: Id_2,
@@ -640,7 +640,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
640640
language: dotnet,
641641
out.host: stackexchangeredis,
642642
out.port: 6379,
643-
redis.raw_command: GEOADD StackExchange.Redis.Database.Geo,
643+
redis.raw_command: GEOADD StackExchange.Redis.Database.GeoAdd,
644644
runtime-id: Guid_1,
645645
span.kind: client,
646646
_dd.base_service: Samples.StackExchange.Redis
@@ -692,7 +692,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
692692
language: dotnet,
693693
out.host: stackexchangeredis,
694694
out.port: 6379,
695-
redis.raw_command: GEODIST StackExchange.Redis.Database.Geo,
695+
redis.raw_command: GEODIST StackExchange.Redis.Database.GeoDistance,
696696
runtime-id: Guid_1,
697697
span.kind: client,
698698
_dd.base_service: Samples.StackExchange.Redis
@@ -744,7 +744,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
744744
language: dotnet,
745745
out.host: stackexchangeredis,
746746
out.port: 6379,
747-
redis.raw_command: GEOHASH StackExchange.Redis.Database.Geo,
747+
redis.raw_command: GEOHASH StackExchange.Redis.Database.GeoHash,
748748
runtime-id: Guid_1,
749749
span.kind: client,
750750
_dd.base_service: Samples.StackExchange.Redis
@@ -796,7 +796,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
796796
language: dotnet,
797797
out.host: stackexchangeredis,
798798
out.port: 6379,
799-
redis.raw_command: GEOPOS StackExchange.Redis.Database.Geo,
799+
redis.raw_command: GEOPOS StackExchange.Redis.Database.GeoPosition,
800800
runtime-id: Guid_1,
801801
span.kind: client,
802802
_dd.base_service: Samples.StackExchange.Redis
@@ -848,7 +848,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
848848
language: dotnet,
849849
out.host: stackexchangeredis,
850850
out.port: 6379,
851-
redis.raw_command: GEORADIUSBYMEMBER StackExchange.Redis.Database.Geo,
851+
redis.raw_command: GEORADIUSBYMEMBER StackExchange.Redis.Database.GeoRadius,
852852
runtime-id: Guid_1,
853853
span.kind: client,
854854
_dd.base_service: Samples.StackExchange.Redis
@@ -1192,7 +1192,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
11921192
language: dotnet,
11931193
out.host: stackexchangeredis,
11941194
out.port: 6379,
1195-
redis.raw_command: HDEL StackExchange.Redis.Database.Hash,
1195+
redis.raw_command: HDEL StackExchange.Redis.Database.HashDelete,
11961196
runtime-id: Guid_1,
11971197
span.kind: client,
11981198
_dd.base_service: Samples.StackExchange.Redis
@@ -1244,7 +1244,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
12441244
language: dotnet,
12451245
out.host: stackexchangeredis,
12461246
out.port: 6379,
1247-
redis.raw_command: HEXISTS StackExchange.Redis.Database.Hash,
1247+
redis.raw_command: HEXISTS StackExchange.Redis.Database.HashExists,
12481248
runtime-id: Guid_1,
12491249
span.kind: client,
12501250
_dd.base_service: Samples.StackExchange.Redis
@@ -1270,7 +1270,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
12701270
language: dotnet,
12711271
out.host: stackexchangeredis,
12721272
out.port: 6379,
1273-
redis.raw_command: HGET StackExchange.Redis.Database.Hash,
1273+
redis.raw_command: HGET StackExchange.Redis.Database.HashGet,
12741274
runtime-id: Guid_1,
12751275
span.kind: client,
12761276
_dd.base_service: Samples.StackExchange.Redis
@@ -1322,7 +1322,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
13221322
language: dotnet,
13231323
out.host: stackexchangeredis,
13241324
out.port: 6379,
1325-
redis.raw_command: HGETALL StackExchange.Redis.Database.Hash,
1325+
redis.raw_command: HGETALL StackExchange.Redis.Database.HashGetAll,
13261326
runtime-id: Guid_1,
13271327
span.kind: client,
13281328
_dd.base_service: Samples.StackExchange.Redis
@@ -1348,7 +1348,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
13481348
language: dotnet,
13491349
out.host: stackexchangeredis,
13501350
out.port: 6379,
1351-
redis.raw_command: HINCRBY StackExchange.Redis.Database.Hash,
1351+
redis.raw_command: HINCRBY StackExchange.Redis.Database.HashIncrement,
13521352
runtime-id: Guid_1,
13531353
span.kind: client,
13541354
_dd.base_service: Samples.StackExchange.Redis
@@ -1426,7 +1426,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
14261426
language: dotnet,
14271427
out.host: stackexchangeredis,
14281428
out.port: 6379,
1429-
redis.raw_command: HINCRBYFLOAT StackExchange.Redis.Database.Hash,
1429+
redis.raw_command: HINCRBYFLOAT StackExchange.Redis.Database.HashDecrement,
14301430
runtime-id: Guid_1,
14311431
span.kind: client,
14321432
_dd.base_service: Samples.StackExchange.Redis
@@ -1478,7 +1478,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
14781478
language: dotnet,
14791479
out.host: stackexchangeredis,
14801480
out.port: 6379,
1481-
redis.raw_command: HKEYS StackExchange.Redis.Database.Hash,
1481+
redis.raw_command: HKEYS StackExchange.Redis.Database.HashKeys,
14821482
runtime-id: Guid_1,
14831483
span.kind: client,
14841484
_dd.base_service: Samples.StackExchange.Redis
@@ -1530,7 +1530,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
15301530
language: dotnet,
15311531
out.host: stackexchangeredis,
15321532
out.port: 6379,
1533-
redis.raw_command: HLEN StackExchange.Redis.Database.Hash,
1533+
redis.raw_command: HLEN StackExchange.Redis.Database.HashLength,
15341534
runtime-id: Guid_1,
15351535
span.kind: client,
15361536
_dd.base_service: Samples.StackExchange.Redis
@@ -1582,7 +1582,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
15821582
language: dotnet,
15831583
out.host: stackexchangeredis,
15841584
out.port: 6379,
1585-
redis.raw_command: HMSET StackExchange.Redis.Database.Hash,
1585+
redis.raw_command: HMSET StackExchange.Redis.Database.HashSet,
15861586
runtime-id: Guid_1,
15871587
span.kind: client,
15881588
_dd.base_service: Samples.StackExchange.Redis
@@ -1634,7 +1634,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
16341634
language: dotnet,
16351635
out.host: stackexchangeredis,
16361636
out.port: 6379,
1637-
redis.raw_command: HVALS StackExchange.Redis.Database.Hash,
1637+
redis.raw_command: HVALS StackExchange.Redis.Database.HashValues,
16381638
runtime-id: Guid_1,
16391639
span.kind: client,
16401640
_dd.base_service: Samples.StackExchange.Redis
@@ -5061,7 +5061,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
50615061
language: dotnet,
50625062
out.host: stackexchangeredis,
50635063
out.port: 6379,
5064-
redis.raw_command: ZREM StackExchange.Redis.Database.Geo,
5064+
redis.raw_command: ZREM StackExchange.Redis.Database.GeoRemove,
50655065
runtime-id: Guid_1,
50665066
span.kind: client,
50675067
_dd.base_service: Samples.StackExchange.Redis

‎tracer/test/snapshots/StackExchangeRedisTests.Latest.SchemaV1.verified.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[
1+
[
22
{
33
TraceId: Id_1,
44
SpanId: Id_2,
@@ -687,7 +687,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
687687
out.host: stackexchangeredis,
688688
out.port: 6379,
689689
peer.service: stackexchangeredis,
690-
redis.raw_command: GEOADD StackExchange.Redis.Database.Geo,
690+
redis.raw_command: GEOADD StackExchange.Redis.Database.GeoAdd,
691691
runtime-id: Guid_1,
692692
span.kind: client,
693693
version: 1.0.0,
@@ -743,7 +743,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
743743
out.host: stackexchangeredis,
744744
out.port: 6379,
745745
peer.service: stackexchangeredis,
746-
redis.raw_command: GEODIST StackExchange.Redis.Database.Geo,
746+
redis.raw_command: GEODIST StackExchange.Redis.Database.GeoDistance,
747747
runtime-id: Guid_1,
748748
span.kind: client,
749749
version: 1.0.0,
@@ -799,7 +799,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
799799
out.host: stackexchangeredis,
800800
out.port: 6379,
801801
peer.service: stackexchangeredis,
802-
redis.raw_command: GEOHASH StackExchange.Redis.Database.Geo,
802+
redis.raw_command: GEOHASH StackExchange.Redis.Database.GeoHash,
803803
runtime-id: Guid_1,
804804
span.kind: client,
805805
version: 1.0.0,
@@ -855,7 +855,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
855855
out.host: stackexchangeredis,
856856
out.port: 6379,
857857
peer.service: stackexchangeredis,
858-
redis.raw_command: GEOPOS StackExchange.Redis.Database.Geo,
858+
redis.raw_command: GEOPOS StackExchange.Redis.Database.GeoPosition,
859859
runtime-id: Guid_1,
860860
span.kind: client,
861861
version: 1.0.0,
@@ -911,7 +911,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
911911
out.host: stackexchangeredis,
912912
out.port: 6379,
913913
peer.service: stackexchangeredis,
914-
redis.raw_command: GEORADIUSBYMEMBER StackExchange.Redis.Database.Geo,
914+
redis.raw_command: GEORADIUSBYMEMBER StackExchange.Redis.Database.GeoRadius,
915915
runtime-id: Guid_1,
916916
span.kind: client,
917917
version: 1.0.0,
@@ -1281,7 +1281,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
12811281
out.host: stackexchangeredis,
12821282
out.port: 6379,
12831283
peer.service: stackexchangeredis,
1284-
redis.raw_command: HDEL StackExchange.Redis.Database.Hash,
1284+
redis.raw_command: HDEL StackExchange.Redis.Database.HashDelete,
12851285
runtime-id: Guid_1,
12861286
span.kind: client,
12871287
version: 1.0.0,
@@ -1337,7 +1337,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
13371337
out.host: stackexchangeredis,
13381338
out.port: 6379,
13391339
peer.service: stackexchangeredis,
1340-
redis.raw_command: HEXISTS StackExchange.Redis.Database.Hash,
1340+
redis.raw_command: HEXISTS StackExchange.Redis.Database.HashExists,
13411341
runtime-id: Guid_1,
13421342
span.kind: client,
13431343
version: 1.0.0,
@@ -1365,7 +1365,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
13651365
out.host: stackexchangeredis,
13661366
out.port: 6379,
13671367
peer.service: stackexchangeredis,
1368-
redis.raw_command: HGET StackExchange.Redis.Database.Hash,
1368+
redis.raw_command: HGET StackExchange.Redis.Database.HashGet,
13691369
runtime-id: Guid_1,
13701370
span.kind: client,
13711371
version: 1.0.0,
@@ -1421,7 +1421,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
14211421
out.host: stackexchangeredis,
14221422
out.port: 6379,
14231423
peer.service: stackexchangeredis,
1424-
redis.raw_command: HGETALL StackExchange.Redis.Database.Hash,
1424+
redis.raw_command: HGETALL StackExchange.Redis.Database.HashGetAll,
14251425
runtime-id: Guid_1,
14261426
span.kind: client,
14271427
version: 1.0.0,
@@ -1449,7 +1449,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
14491449
out.host: stackexchangeredis,
14501450
out.port: 6379,
14511451
peer.service: stackexchangeredis,
1452-
redis.raw_command: HINCRBY StackExchange.Redis.Database.Hash,
1452+
redis.raw_command: HINCRBY StackExchange.Redis.Database.HashIncrement,
14531453
runtime-id: Guid_1,
14541454
span.kind: client,
14551455
version: 1.0.0,
@@ -1533,7 +1533,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
15331533
out.host: stackexchangeredis,
15341534
out.port: 6379,
15351535
peer.service: stackexchangeredis,
1536-
redis.raw_command: HINCRBYFLOAT StackExchange.Redis.Database.Hash,
1536+
redis.raw_command: HINCRBYFLOAT StackExchange.Redis.Database.HashDecrement,
15371537
runtime-id: Guid_1,
15381538
span.kind: client,
15391539
version: 1.0.0,
@@ -1589,7 +1589,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
15891589
out.host: stackexchangeredis,
15901590
out.port: 6379,
15911591
peer.service: stackexchangeredis,
1592-
redis.raw_command: HKEYS StackExchange.Redis.Database.Hash,
1592+
redis.raw_command: HKEYS StackExchange.Redis.Database.HashKeys,
15931593
runtime-id: Guid_1,
15941594
span.kind: client,
15951595
version: 1.0.0,
@@ -1645,7 +1645,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
16451645
out.host: stackexchangeredis,
16461646
out.port: 6379,
16471647
peer.service: stackexchangeredis,
1648-
redis.raw_command: HLEN StackExchange.Redis.Database.Hash,
1648+
redis.raw_command: HLEN StackExchange.Redis.Database.HashLength,
16491649
runtime-id: Guid_1,
16501650
span.kind: client,
16511651
version: 1.0.0,
@@ -1701,7 +1701,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
17011701
out.host: stackexchangeredis,
17021702
out.port: 6379,
17031703
peer.service: stackexchangeredis,
1704-
redis.raw_command: HMSET StackExchange.Redis.Database.Hash,
1704+
redis.raw_command: HMSET StackExchange.Redis.Database.HashSet,
17051705
runtime-id: Guid_1,
17061706
span.kind: client,
17071707
version: 1.0.0,
@@ -1757,7 +1757,7 @@ StackExchange.Redis.RedisServerException: WRONGTYPE Operation against a key hold
17571757
out.host: stackexchangeredis,
17581758
out.port: 6379,
17591759
peer.service: stackexchangeredis,
1760-
redis.raw_command: HVALS StackExchange.Redis.Database.Hash,
1760+
redis.raw_command: HVALS StackExchange.Redis.Database.HashValues,
17611761
runtime-id: Guid_1,
17621762
span.kind: client,
17631763
version: 1.0.0,
@@ -5444,7 +5444,7 @@ at StackExchange.Redis.ConnectionMultiplexer.ExecuteSyncImpl[T](Message message,
54445444
out.host: stackexchangeredis,
54455445
out.port: 6379,
54465446
peer.service: stackexchangeredis,
5447-
redis.raw_command: ZREM StackExchange.Redis.Database.Geo,
5447+
redis.raw_command: ZREM StackExchange.Redis.Database.GeoRemove,
54485448
runtime-id: Guid_1,
54495449
span.kind: client,
54505450
version: 1.0.0,

0 commit comments

Comments
 (0)