Fix

trask · trask · commit 9f9fdc5ba361 · 2024-09-23T15:03:22.000-07:00
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/keytransaction/KeyTransactionSampler.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/keytransaction/KeyTransactionSampler.java
@@ -84,6 +84,9 @@ public SamplingResult shouldSample(
     SamplingResult result =
         fallback.shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks);
 
+    if (existingKeyTransactions.isEmpty() && startKeyTransactions.isEmpty()) {
+      return result;
+    }
     return new TransactionSamplingResult(
         existingKeyTransactions, startKeyTransactions, endKeyTransactions, result);
   }
diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/Samplers.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/sampling/Samplers.java
@@ -55,7 +55,7 @@ public static Sampler getSampler(
       // as
       // it will ensure consistent traces, however it does not accurately compute item counts, since
       // item counts are not propagated in trace state (yet)
-      return Sampler.parentBasedBuilder(sampler).build();
+      sampler = Sampler.parentBasedBuilder(sampler).build();
     }
 
     if (KeyTransactionConfigSupplier.KEY_TRANSACTIONS_ENABLED) {

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,9 @@ public SamplingResult shouldSample(`
`84`	`84`	`SamplingResult result =`
`85`	`85`	`fallback.shouldSample(parentContext, traceId, name, spanKind, attributes, parentLinks);`
`86`	`86`
	`87`	`+ if (existingKeyTransactions.isEmpty() && startKeyTransactions.isEmpty()) {`
	`88`	`+ return result;`
	`89`	`+ }`
`87`	`90`	`return new TransactionSamplingResult(`
`88`	`91`	`existingKeyTransactions, startKeyTransactions, endKeyTransactions, result);`
`89`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public static Sampler getSampler(`
`55`	`55`	`// as`
`56`	`56`	`// it will ensure consistent traces, however it does not accurately compute item counts, since`
`57`	`57`	`// item counts are not propagated in trace state (yet)`
`58`		`- return Sampler.parentBasedBuilder(sampler).build();`
	`58`	`+ sampler = Sampler.parentBasedBuilder(sampler).build();`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`if (KeyTransactionConfigSupplier.KEY_TRANSACTIONS_ENABLED) {`