From 546ef3fd68e8e93368af53fd6dcee079b8ba3a45 Mon Sep 17 00:00:00 2001 From: Oleksiy Dubinin <88040756+rypdal@users.noreply.github.com> Date: Thu, 13 Apr 2023 10:06:14 +0200 Subject: [PATCH 1/2] Update src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #1034: suggested config option description Co-authored-by: Christian Neumüller --- .../AWSLambdaInstrumentationOptions.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs b/src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs index 72f8e83476..8930b25a49 100644 --- a/src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs +++ b/src/OpenTelemetry.Instrumentation.AWSLambda/AWSLambdaInstrumentationOptions.cs @@ -27,8 +27,11 @@ public class AWSLambdaInstrumentationOptions public bool DisableAwsXRayContextExtraction { get; set; } /// - /// Gets or sets a value indicating whether the parent Activity should be set when SQS message batch is received. - /// If option is set to true then the parent is set using the last received message otherwise the parent is not set at all. + /// Gets or sets a value indicating whether the parent Activity should be set when a potentially batched event is received where multiple parents are potentially available (e.g. SQS). + /// If set to true, the parent is set using the last received record (e.g. last message). Otherwise the parent is not set. In both cases, links will be created for such events. /// - public bool SetParentFromMessageBatch { get; set; } + /// + /// Currently, the only event type to which this applies is SQS. + /// + public bool SetParentFromBatch { get; set; } } From 0460e9b14f9e3c2651cdf82f531b09c12e5d787b Mon Sep 17 00:00:00 2001 From: Oleksiy Dubinin <88040756+rypdal@users.noreply.github.com> Date: Thu, 13 Apr 2023 10:12:06 +0200 Subject: [PATCH 2/2] Update src/OpenTelemetry.Instrumentation.AWSLambda/Implementation/AWSMessagingUtils.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #1034: review suggestion Co-authored-by: Christian Neumüller --- .../Implementation/AWSMessagingUtils.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Instrumentation.AWSLambda/Implementation/AWSMessagingUtils.cs b/src/OpenTelemetry.Instrumentation.AWSLambda/Implementation/AWSMessagingUtils.cs index 457acd4fe3..05f28caacf 100644 --- a/src/OpenTelemetry.Instrumentation.AWSLambda/Implementation/AWSMessagingUtils.cs +++ b/src/OpenTelemetry.Instrumentation.AWSLambda/Implementation/AWSMessagingUtils.cs @@ -87,7 +87,7 @@ internal static PropagationContext ExtractParentContext(SQSEvent.SQSMessage sqsM internal static PropagationContext ExtractParentContext(SNSEvent snsEvent) { // We assume there can be only a single SNS record (message) and records list is kept in the model consistency. - // See https://aws.amazon.com/sns/faqs/ for details. + // See https://aws.amazon.com/sns/faqs/#Reliability for details. var record = snsEvent?.Records?.LastOrDefault(); return ExtractParentContext(record); }