Use new faas attributes #3086

Author: thompson-tomo

opentelemetry-dotnet-contrib.sln

@@ -416,6 +416,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AWS", "AWS", "{02EA681E-C7D
 		src\Shared\AWS\AWSSemanticConventions.Legacy.cs = src\Shared\AWS\AWSSemanticConventions.Legacy.cs
 		src\Shared\AWS\AWSSemanticConventions.v1.28.0.cs = src\Shared\AWS\AWSSemanticConventions.v1.28.0.cs
 		src\Shared\AWS\AWSSemanticConventions.v1.29.0.cs = src\Shared\AWS\AWSSemanticConventions.v1.29.0.cs
+		src\Shared\AWS\AWSSemanticConventions.v1.38.0.cs = src\Shared\AWS\AWSSemanticConventions.v1.38.0.cs
 		src\Shared\AWS\SemanticConventionVersion.cs = src\Shared\AWS\SemanticConventionVersion.cs
 	EndProjectSection
 EndProject

src/OpenTelemetry.Instrumentation.AWS/.publicApi/PublicAPI.Unshipped.txt

@@ -0,0 +1 @@
+OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion.V1_38_0 = 3 -> OpenTelemetry.Instrumentation.AWS.SemanticConventionVersion

src/OpenTelemetry.Instrumentation.AWSLambda/.publicApi/PublicAPI.Unshipped.txt

@@ -0,0 +1 @@
+OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion.V1_38_0 = 3 -> OpenTelemetry.Instrumentation.AWSLambda.SemanticConventionVersion

src/OpenTelemetry.Instrumentation.AWSLambda/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+* Switch to `fass.function.id` rather than `cloud.resource.id` for the resource signal.
+  ([#3087](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3087))
+* Switch to `faas.instance.id` rather than `faas.instance` for the span and resource signals.
+  ([#3087](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3087))
+* Remove `faas.name` & `faas.version` from the resource signal as the identifying attribute is not available.
+  ([#3087](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3087))
+
 ## 1.12.1
 
 Released 2025-Sep-03

src/OpenTelemetry.Instrumentation.AWSLambda/Implementation/AWSLambdaResourceDetector.cs

@@ -26,9 +26,8 @@ public Resource Detect()
                 .AttributeBuilder
                 .AddAttributeCloudProviderIsAWS()
                 .AddAttributeCloudRegion(AWSLambdaUtils.GetAWSRegion())
-                .AddAttributeFaasName(AWSLambdaUtils.GetFunctionName())
-                .AddAttributeFaasVersion(AWSLambdaUtils.GetFunctionVersion())
                 .AddAttributeFaasInstance(AWSLambdaUtils.GetFunctionInstance())
+                .AddAttributeFaasInstanceId(AWSLambdaUtils.GetFunctionInstance())
                 .AddAttributeFaasMaxMemory(AWSLambdaUtils.GetFunctionMemorySize())
                 .Build();
 

src/OpenTelemetry.Instrumentation.AWSLambda/Implementation/AWSLambdaUtils.cs

@@ -175,10 +175,12 @@ internal IEnumerable<KeyValuePair<string, object>> GetFunctionTags<TInput>(TInpu
                 .AttributeBuilder
                 .AddAttributeFaasTrigger(GetFaasTrigger(input))
                 .AddAttributeFaasColdStart(isColdStart)
+                .AddAttributeFaasFunctionID(GetFaasId(functionArn))
                 .AddAttributeFaasName(GetFunctionName(context))
                 .AddAttributeFaasExecution(context.AwsRequestId)
                 .AddAttributeFaasID(GetFaasId(functionArn))
                 .AddAttributeFaasInstance(GetFunctionInstance(context))
+                .AddAttributeFaasInstanceId(GetFunctionInstance(context))
                 .AddAttributeFaasMaxMemory(GetFunctionMemorySize(context))
                 .AddAttributeCloudAccountID(GetAccountId(functionArn))
                 .Build();

src/OpenTelemetry.Resources.AWS/.publicApi/.NETCoreApp/PublicAPI.Unshipped.txt

@@ -0,0 +1 @@
+OpenTelemetry.Resources.AWS.SemanticConventionVersion.V1_38_0 = 3 -> OpenTelemetry.Resources.AWS.SemanticConventionVersion

src/Shared/AWS/AWSSemanticConventions.Base.cs

@@ -367,6 +367,35 @@ private abstract class AWSSemanticConventionsBase
         /// </remarks>
         public virtual string AttributeFaasID => string.Empty;
 
+        /// <summary>
+        /// Cloud provider-specific native identifier of the monitored cloud resource (e.g. an <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a> on AWS, a <a href="https://learn.microsoft.com/rest/api/resources/resources/get-by-id">fully qualified resource ID</a> on Azure, a <a href="https://cloud.google.com/apis/design/resource_names#full_resource_name">full resource name</a> on GCP).
+        /// </summary>
+        /// <remarks>
+        /// On some cloud providers, it may not be possible to determine the full ID at startup,
+        /// so it may be necessary to set <c>cloud.resource_id</c> as a span attribute instead.
+        /// <p>
+        /// The exact value to use for <c>cloud.resource_id</c> depends on the cloud provider.
+        /// The following well-known definitions MUST be used if you set this attribute and they apply:
+        /// <p>
+        /// <ul>
+        ///   <li><strong>AWS Lambda:</strong> The function <a href="https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html">ARN</a>.
+        /// Take care not to use the "invoked ARN" directly but replace any
+        /// <a href="https://docs.aws.amazon.com/lambda/latest/dg/configuration-aliases.html">alias suffix</a>
+        /// with the resolved function version, as the same runtime instance may be invocable with
+        /// multiple different aliases.</li>
+        ///   <li><strong>GCP:</strong> The <a href="https://cloud.google.com/iam/docs/full-resource-names">URI of the resource</a></li>
+        ///   <li><strong>Azure:</strong> The <a href="https://docs.microsoft.com/rest/api/resources/resources/get-by-id">Fully Qualified Resource ID</a> of the invoked function,
+        /// <em>not</em> the function app, having the form
+        /// <c>/subscriptions/<SUBSCRIPTION_GUID>/resourceGroups/<RG>/providers/Microsoft.Web/sites/<FUNCAPP>/functions/<FUNC></c>.
+        /// This means that a span attribute MUST be used, as an Azure function app can host multiple functions that would usually share
+        /// a TracerProvider.</li>
+        /// </ul>
+        /// </remarks>
+        /// <remarks>
+        /// FaasAttributes.AttributeFaasFunctionId
+        /// </remarks>
+        public virtual string AttributeFaasFunctionId => string.Empty;
+
         /// <summary>
         /// The invocation ID of the current function invocation.
         /// </summary>
@@ -448,6 +477,14 @@ private abstract class AWSSemanticConventionsBase
         /// </remarks>
         public virtual string AttributeFaasInstance => string.Empty;
 
+        /// <summary>
+        /// The execution environment ID as a string, that will be potentially reused for other invocations to the same function/function version.
+        /// </summary>
+        /// <remarks>
+        /// FaasAttributes.AttributeFaasInstanceId
+        /// </remarks>
+        public virtual string AttributeFaasInstanceId => string.Empty;
+
         /// <summary>
         /// The amount of memory available to the serverless function converted to Bytes.
         /// </summary>

src/Shared/AWS/AWSSemanticConventions.cs

@@ -270,6 +270,10 @@ public AttributeBuilderImpl AddAttributeLogStreamArns(object? value, bool addIfE
         public AttributeBuilderImpl AddAttributeFaasID(object? value, bool addIfEmpty = false) =>
             this.awsSemanticConventions.Add(this, x => x.AttributeFaasID, value, addIfEmpty);
 
+        /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeFaasID"/>
+        public AttributeBuilderImpl AddAttributeFaasFunctionID(object? value, bool addIfEmpty = false) =>
+            this.awsSemanticConventions.Add(this, x => x.AttributeFaasFunctionId, value, addIfEmpty);
+
         /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeFaasExecution"/>
         public AttributeBuilderImpl AddAttributeFaasExecution(object? value, bool addIfEmpty = false) =>
             this.awsSemanticConventions.Add(this, x => x.AttributeFaasExecution, value, addIfEmpty);
@@ -294,6 +298,10 @@ public AttributeBuilderImpl AddAttributeFaasColdStart(object? value, bool addIfE
         public AttributeBuilderImpl AddAttributeFaasInstance(object? value, bool addIfEmpty = false) =>
             this.awsSemanticConventions.Add(this, x => x.AttributeFaasInstance, value, addIfEmpty);
 
+        /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeFaasInstanceId"/>
+        public AttributeBuilderImpl AddAttributeFaasInstanceId(object? value, bool addIfEmpty = false) =>
+            this.awsSemanticConventions.Add(this, x => x.AttributeFaasInstanceId, value, addIfEmpty);
+
         /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeFaasMaxMemory"/>
         public AttributeBuilderImpl AddAttributeFaasMaxMemory(object? value, bool addIfEmpty = false) =>
             this.awsSemanticConventions.Add(this, x => x.AttributeFaasMaxMemory, value, addIfEmpty);
@@ -494,6 +502,8 @@ private AWSSemanticConventionsBase GetSemanticConventionVersion()
         switch (this.semanticConventionVersion)
         {
             case SemanticConventionVersion.Latest:
+            case SemanticConventionVersion.V1_38_0:
+                return new AWSSemanticConventions_V1_38_0();
             case SemanticConventionVersion.V1_29_0:
                 return new AWSSemanticConventions_V1_29_0();
 

src/Shared/AWS/AWSSemanticConventions.v1.38.0.cs

@@ -0,0 +1,26 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+namespace OpenTelemetry.AWS;
+
+// disable Style Warnings to improve readability of this specific file.
+#pragma warning disable SA1124
+#pragma warning disable SA1005
+#pragma warning disable SA1514
+#pragma warning disable SA1201
+#pragma warning disable SA1516
+
+internal partial class AWSSemanticConventions
+{
+    /// <summary>
+    /// Open Telemetry Semantic Conventions as of 1.29.0:
+    /// https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.29.0.
+    /// </summary>
+    private class AWSSemanticConventions_V1_38_0 : AWSSemanticConventions_V1_29_0
+    {
+        public override string AttributeFaasInstanceId => "faas.instance.id";
+        public override string AttributeFaasInstance => string.Empty;
+        public override string AttributeFaasFunctionId => "faas.function.id";
+        public override string AttributeFaasID => string.Empty;
+    }
+}