Fix sampling ratio test. Fix span event sampling and extend tests.

kinyoklion · kinyoklion · commit 77a6c3f8a230 · 2025-05-12T15:22:49.000-07:00
diff --git a/sdk/highlight-run/src/client/graph/operators/query.gql b/sdk/highlight-run/src/client/graph/operators/query.gql
@@ -13,17 +13,17 @@ query GetSamplingConfig($project_id: ID!) {
 				}
 			}
 			events {
-					name {
+				name {
+					...MatchParts
+				}
+				attributes {
+					key {
 						...MatchParts
 					}
-					attributes {
-						key {
-							...MatchParts
-						}
-						attribute {
-							...MatchParts
-						}
+					attribute {
+						...MatchParts
 					}
+				}
 			}
 			samplingRatio
 		}
diff --git a/sdk/highlight-run/src/client/otel/sampling/CustomSampler.ts b/sdk/highlight-run/src/client/otel/sampling/CustomSampler.ts
@@ -156,9 +156,11 @@ export class CustomSampler implements ExportSampler {
 		eventConfig: SpanEventMatchConfig,
 		event: TimedEvent,
 	): boolean {
-		// Match by event name
-		if (!this.matchesValue(eventConfig.name, event.name)) {
-			return false
+		if (eventConfig.name) {
+			// Match by event name
+			if (!this.matchesValue(eventConfig.name, event.name)) {
+				return false
+			}
 		}
 
 		// Match by event attributes if specified
diff --git a/sdk/highlight-run/src/client/otel/sampling/log-test-scenarios.json b/sdk/highlight-run/src/client/otel/sampling/log-test-scenarios.json
@@ -20,7 +20,7 @@
 				"expected_result": {
 					"sample": true,
 					"attributes": {
-						"launchdarkly.samplingRatio": 42
+						"launchdarkly.sampling.ratio": 42
 					}
 				}
 			},
@@ -29,7 +29,7 @@
 				"expected_result": {
 					"sample": false,
 					"attributes": {
-						"launchdarkly.samplingRatio": 42
+						"launchdarkly.sampling.ratio": 42
 					}
 				}
 			}
@@ -56,7 +56,7 @@
 				"expected_result": {
 					"sample": true,
 					"attributes": {
-						"launchdarkly.samplingRatio": 42
+						"launchdarkly.sampling.ratio": 42
 					}
 				}
 			},
@@ -65,7 +65,7 @@
 				"expected_result": {
 					"sample": false,
 					"attributes": {
-						"launchdarkly.samplingRatio": 42
+						"launchdarkly.sampling.ratio": 42
 					}
 				}
 			}
@@ -117,7 +117,7 @@
 				"expected_result": {
 					"sample": true,
 					"attributes": {
-						"launchdarkly.samplingRatio": 42
+						"launchdarkly.sampling.ratio": 42
 					}
 				}
 			},
@@ -126,7 +126,7 @@
 				"expected_result": {
 					"sample": false,
 					"attributes": {
-						"launchdarkly.samplingRatio": 42
+						"launchdarkly.sampling.ratio": 42
 					}
 				}
 			}
@@ -163,7 +163,7 @@
 				"expected_result": {
 					"sample": true,
 					"attributes": {
-						"launchdarkly.samplingRatio": 75
+						"launchdarkly.sampling.ratio": 75
 					}
 				}
 			},
@@ -172,7 +172,7 @@
 				"expected_result": {
 					"sample": false,
 					"attributes": {
-						"launchdarkly.samplingRatio": 75
+						"launchdarkly.sampling.ratio": 75
 					}
 				}
 			}
@@ -209,7 +209,7 @@
 				"expected_result": {
 					"sample": true,
 					"attributes": {
-						"launchdarkly.samplingRatio": 75
+						"launchdarkly.sampling.ratio": 75
 					}
 				}
 			},
@@ -218,7 +218,7 @@
 				"expected_result": {
 					"sample": false,
 					"attributes": {
-						"launchdarkly.samplingRatio": 75
+						"launchdarkly.sampling.ratio": 75
 					}
 				}
 			}
@@ -255,7 +255,7 @@
 				"expected_result": {
 					"sample": true,
 					"attributes": {
-						"launchdarkly.samplingRatio": 100
+						"launchdarkly.sampling.ratio": 100
 					}
 				}
 			},
@@ -264,7 +264,7 @@
 				"expected_result": {
 					"sample": false,
 					"attributes": {
-						"launchdarkly.samplingRatio": 100
+						"launchdarkly.sampling.ratio": 100
 					}
 				}
 			}
@@ -301,7 +301,7 @@
 				"expected_result": {
 					"sample": true,
 					"attributes": {
-						"launchdarkly.samplingRatio": 50
+						"launchdarkly.sampling.ratio": 50
 					}
 				}
 			},
@@ -310,7 +310,7 @@
 				"expected_result": {
 					"sample": false,
 					"attributes": {
-						"launchdarkly.samplingRatio": 50
+						"launchdarkly.sampling.ratio": 50
 					}
 				}
 			}
@@ -374,7 +374,7 @@
 				"expected_result": {
 					"sample": true,
 					"attributes": {
-						"launchdarkly.samplingRatio": 90
+						"launchdarkly.sampling.ratio": 90
 					}
 				}
 			},
@@ -383,7 +383,7 @@
 				"expected_result": {
 					"sample": false,
 					"attributes": {
-						"launchdarkly.samplingRatio": 90
+						"launchdarkly.sampling.ratio": 90
 					}
 				}
 			}
diff --git a/sdk/highlight-run/src/client/otel/sampling/span-test-scenarios.json b/sdk/highlight-run/src/client/otel/sampling/span-test-scenarios.json

Original file line number	Diff line number	Diff line change
`@@ -13,17 +13,17 @@ query GetSamplingConfig($project_id: ID!) {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`events {`
`16`		`- name {`
	`16`	`+ name {`
	`17`	`+ ...MatchParts`
	`18`	`+ }`
	`19`	`+ attributes {`
	`20`	`+ key {`
`17`	`21`	`...MatchParts`
`18`	`22`	`}`
`19`		`- attributes {`
`20`		`- key {`
`21`		`- ...MatchParts`
`22`		`- }`
`23`		`- attribute {`
`24`		`- ...MatchParts`
`25`		`- }`
	`23`	`+ attribute {`
	`24`	`+ ...MatchParts`
`26`	`25`	`}`
	`26`	`+ }`
`27`	`27`	`}`
`28`	`28`	`samplingRatio`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`"expected_result": {`
`21`	`21`	`"sample": true,`
`22`	`22`	`"attributes": {`
`23`		`- "launchdarkly.samplingRatio": 42`
	`23`	`+ "launchdarkly.sampling.ratio": 42`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`},`
`@@ -29,7 +29,7 @@`
`29`	`29`	`"expected_result": {`
`30`	`30`	`"sample": false,`
`31`	`31`	`"attributes": {`
`32`		`- "launchdarkly.samplingRatio": 42`
	`32`	`+ "launchdarkly.sampling.ratio": 42`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
`@@ -56,7 +56,7 @@`
`56`	`56`	`"expected_result": {`
`57`	`57`	`"sample": true,`
`58`	`58`	`"attributes": {`
`59`		`- "launchdarkly.samplingRatio": 42`
	`59`	`+ "launchdarkly.sampling.ratio": 42`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`},`
`@@ -65,7 +65,7 @@`
`65`	`65`	`"expected_result": {`
`66`	`66`	`"sample": false,`
`67`	`67`	`"attributes": {`
`68`		`- "launchdarkly.samplingRatio": 42`
	`68`	`+ "launchdarkly.sampling.ratio": 42`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`
`@@ -117,7 +117,7 @@`
`117`	`117`	`"expected_result": {`
`118`	`118`	`"sample": true,`
`119`	`119`	`"attributes": {`
`120`		`- "launchdarkly.samplingRatio": 42`
	`120`	`+ "launchdarkly.sampling.ratio": 42`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`},`
`@@ -126,7 +126,7 @@`
`126`	`126`	`"expected_result": {`
`127`	`127`	`"sample": false,`
`128`	`128`	`"attributes": {`
`129`		`- "launchdarkly.samplingRatio": 42`
	`129`	`+ "launchdarkly.sampling.ratio": 42`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`	`}`
`@@ -163,7 +163,7 @@`
`163`	`163`	`"expected_result": {`
`164`	`164`	`"sample": true,`
`165`	`165`	`"attributes": {`
`166`		`- "launchdarkly.samplingRatio": 75`
	`166`	`+ "launchdarkly.sampling.ratio": 75`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`},`
`@@ -172,7 +172,7 @@`
`172`	`172`	`"expected_result": {`
`173`	`173`	`"sample": false,`
`174`	`174`	`"attributes": {`
`175`		`- "launchdarkly.samplingRatio": 75`
	`175`	`+ "launchdarkly.sampling.ratio": 75`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`}`
`@@ -209,7 +209,7 @@`
`209`	`209`	`"expected_result": {`
`210`	`210`	`"sample": true,`
`211`	`211`	`"attributes": {`
`212`		`- "launchdarkly.samplingRatio": 75`
	`212`	`+ "launchdarkly.sampling.ratio": 75`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`	`},`
`@@ -218,7 +218,7 @@`
`218`	`218`	`"expected_result": {`
`219`	`219`	`"sample": false,`
`220`	`220`	`"attributes": {`
`221`		`- "launchdarkly.samplingRatio": 75`
	`221`	`+ "launchdarkly.sampling.ratio": 75`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`}`
`@@ -255,7 +255,7 @@`
`255`	`255`	`"expected_result": {`
`256`	`256`	`"sample": true,`
`257`	`257`	`"attributes": {`
`258`		`- "launchdarkly.samplingRatio": 100`
	`258`	`+ "launchdarkly.sampling.ratio": 100`
`259`	`259`	`}`
`260`	`260`	`}`
`261`	`261`	`},`
`@@ -264,7 +264,7 @@`
`264`	`264`	`"expected_result": {`
`265`	`265`	`"sample": false,`
`266`	`266`	`"attributes": {`
`267`		`- "launchdarkly.samplingRatio": 100`
	`267`	`+ "launchdarkly.sampling.ratio": 100`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`	`}`
`@@ -301,7 +301,7 @@`
`301`	`301`	`"expected_result": {`
`302`	`302`	`"sample": true,`
`303`	`303`	`"attributes": {`
`304`		`- "launchdarkly.samplingRatio": 50`
	`304`	`+ "launchdarkly.sampling.ratio": 50`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`	`},`
`@@ -310,7 +310,7 @@`
`310`	`310`	`"expected_result": {`
`311`	`311`	`"sample": false,`
`312`	`312`	`"attributes": {`
`313`		`- "launchdarkly.samplingRatio": 50`
	`313`	`+ "launchdarkly.sampling.ratio": 50`
`314`	`314`	`}`
`315`	`315`	`}`
`316`	`316`	`}`
`@@ -374,7 +374,7 @@`
`374`	`374`	`"expected_result": {`
`375`	`375`	`"sample": true,`
`376`	`376`	`"attributes": {`
`377`		`- "launchdarkly.samplingRatio": 90`
	`377`	`+ "launchdarkly.sampling.ratio": 90`
`378`	`378`	`}`
`379`	`379`	`}`
`380`	`380`	`},`
`@@ -383,7 +383,7 @@`
`383`	`383`	`"expected_result": {`
`384`	`384`	`"sample": false,`
`385`	`385`	`"attributes": {`
`386`		`- "launchdarkly.samplingRatio": 90`
	`386`	`+ "launchdarkly.sampling.ratio": 90`
`387`	`387`	`}`
`388`	`388`	`}`
`389`	`389`	`}`