Added Lambda Changes (#144)

Author: AsakerMohd

build/Build.cs

@@ -12,7 +12,7 @@
 
 internal partial class Build : NukeBuild
 {
-    private const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.7.0";
+    private const string OpenTelemetryAutoInstrumentationDefaultVersion = "v1.9.0";
     private static readonly AbsolutePath TestNuGetPackageApps = NukeBuild.RootDirectory / "test" / "test-applications" / "nuget-package";
 
     [Solution("AWS.Distro.OpenTelemetry.AutoInstrumentation.sln")]

instrument.sh

@@ -214,7 +214,8 @@ if [ "$ENABLE_PROFILING" = "true" ]; then
       export OTEL_TRACES_EXPORTER="none";
     fi
 
-    # TODO: need to disable all instrumentations except aws sdk and lambda.
+    export OTEL_DOTNET_AUTO_TRACES_INSTRUMENTATION_ENABLED="false"
+    export OTEL_DOTNET_AUTO_METRICS_INSTRUMENTATION_ENABLED="false"
 
   else
     export OTEL_EXPORTER_OTLP_PROTOCOL="http/protobuf"

src/AWS.Distro.OpenTelemetry.AutoInstrumentation/AwsSpanProcessingUtil.cs

@@ -69,6 +69,9 @@ internal sealed class AwsSpanProcessingUtil
     private static readonly string HttpRouteDataParsingEnabledConfig = "HTTP_ROUTE_DATA_PARSING_ENABLED";
     private static readonly string HttpRouteDataParsingEnabled = System.Environment.GetEnvironmentVariable(HttpRouteDataParsingEnabledConfig) ?? "false";
 
+    private static readonly string AwsLambdaFunctionNameConfig = "AWS_LAMBDA_FUNCTION_NAME";
+    private static readonly string? AwsLambdaFunctionName = Environment.GetEnvironmentVariable(AwsLambdaFunctionNameConfig);
+
     internal static List<string> GetDialectKeywords()
     {
         try
@@ -111,6 +114,14 @@ internal static string GetIngressOperation(Activity span)
         {
             return InternalOperation;
         }
+
+        // There is the case where we can run an ASP.NET application in a lambda environment.
+        // In this case, we need to decide which takes precedence for the aws.local.operation
+        // between functionName/FunctionHandler or the route template.
+        else if (IsLambdaEnvironment())
+        {
+            return AwsLambdaFunctionName + "/FunctionHandler";
+        }
         else if (span.GetCustomProperty("HttpContextWeakRef") != null)
         {
             return GetRouteTemplate(span);
@@ -168,7 +179,7 @@ internal static string RouteFallback(Activity span)
     }
 
 #if NETFRAMEWORK
-    // Uses reflection to the get the HttpRequestRouteHelper.GetRouteTemplate to get the 
+    // Uses reflection to the get the HttpRequestRouteHelper.GetRouteTemplate to get the
     // route template from NETFRAMEWORK applications.
     // https://github.com/open-telemetry/opentelemetry-dotnet-contrib/blob/main/src/OpenTelemetry.Instrumentation.AspNet/Implementation/HttpRequestRouteHelper.cs#L12
     internal static string? GetHttpRouteData(HttpContext httpContext)
@@ -285,6 +296,12 @@ internal static bool IsLocalRoot(Activity span)
         return span.Parent == null || !span.Parent.Context.IsValid() || span.HasRemoteParent;
     }
 
+    internal static bool IsLambdaEnvironment()
+    {
+        // detect if running in AWS Lambda environment
+        return AwsLambdaFunctionName != null;
+    }
+
     // To identify the SQS consumer spans produced by AWS SDK instrumentation
     // TODO: Verify this after AWS SDK AutoInstrumentation
     // Can also use this instead to check the service name

src/AWS.Distro.OpenTelemetry.AutoInstrumentation/Plugin.cs

@@ -48,9 +48,6 @@ public class Plugin
     private static readonly string BackupSamplerEnabledConfig = "BACKUP_SAMPLER_ENABLED";
     private static readonly string BackupSamplerEnabled = System.Environment.GetEnvironmentVariable(BackupSamplerEnabledConfig) ?? "true";
 
-    private static readonly string AwsLambdaFunctionNameConfig = "AWS_LAMBDA_FUNCTION_NAME";
-    private static readonly string? AwsLambdaFunctionName = System.Environment.GetEnvironmentVariable(AwsLambdaFunctionNameConfig);
-
     private static readonly string AwsXrayDaemonAddressConfig = "AWS_XRAY_DAEMON_ADDRESS";
     private static readonly string? AwsXrayDaemonAddress = System.Environment.GetEnvironmentVariable(AwsXrayDaemonAddressConfig);
 
@@ -106,7 +103,7 @@ public void TracerProviderInitialized(TracerProvider tracerProvider)
 
             // We want to be adding the exporter as the last processor in the traceProvider since processors
             // are executed in the order they were added to the provider.
-            if (this.IsLambdaEnvironment() && !this.HasCustomTracesEndpoint())
+            if (AwsSpanProcessingUtil.IsLambdaEnvironment() && !this.HasCustomTracesEndpoint())
             {
                 Resource processResource = tracerProvider.GetResource();
 
@@ -120,7 +117,7 @@ public void TracerProviderInitialized(TracerProvider tracerProvider)
             }
 
             // Disable Application Metrics for Lambda environment
-            if (!this.IsLambdaEnvironment())
+            if (!AwsSpanProcessingUtil.IsLambdaEnvironment())
             {
                 string? intervalConfigString = System.Environment.GetEnvironmentVariable(MetricExportIntervalConfig);
                 int exportInterval = DefaultMetricExportInterval;
@@ -183,7 +180,6 @@ public TracerProviderBuilder BeforeConfigureTracerProvider(TracerProviderBuilder
             builder.AddProcessor(processor);
         }
 
-        // My custom logic here
         builder.AddAWSInstrumentation();
 #if !NETFRAMEWORK
         builder.AddAWSLambdaConfigurations();
@@ -260,6 +256,11 @@ public void ConfigureTracesOptions(HttpClientTraceInstrumentationOptions options
                 return false;
             }
 
+            if (request.RequestUri?.AbsolutePath.Contains("/runtime/invocation/") == true)
+            {
+                return false;
+            }
+
             return true;
         };
 
@@ -409,7 +410,7 @@ private ResourceBuilder ResourceBuilderCustomizer(ResourceBuilder builder)
 
         // Resource detectors are disabled if the environment variable is explicitly set to false or if the
         // application is in a lambda environment
-        if (resourceDetectorsEnabled != "true" || this.IsLambdaEnvironment())
+        if (resourceDetectorsEnabled != "true" || AwsSpanProcessingUtil.IsLambdaEnvironment())
         {
             return builder;
         }
@@ -460,12 +461,6 @@ private OtlpMetricExporter ApplicationSignalsExporterProvider()
         return new OtlpMetricExporter(options);
     }
 
-    private bool IsLambdaEnvironment()
-    {
-        // detect if running in AWS Lambda environment
-        return AwsLambdaFunctionName != null;
-    }
-
     private bool HasCustomTracesEndpoint()
     {
         // detect if running in AWS Lambda environment