adjust strategy to list attributes as obsolete and add additional Add…

…Attribute calls in core logic

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

@@ -8,6 +8,9 @@
 using Amazon.Lambda.ApplicationLoadBalancerEvents;
 using OpenTelemetry.AWS;
 
+// Continue to off obsolete Semantic Convention until the next major version bump
+#pragma warning disable CS0618 // Type or member is obsolete
+
 namespace OpenTelemetry.Instrumentation.AWSLambda.Implementation;
 
 internal class AWSLambdaHttpUtils
@@ -64,17 +67,11 @@ internal static IEnumerable<KeyValuePair<string, object>> GetHttpTags<TInput>(TI
         if (httpScheme != null)
         {
             tags.AddAttributeHttpScheme(httpScheme, addIfEmpty: true);
+            tags.AddAttributeUrlScheme(httpScheme, addIfEmpty: true);
         }
 
-        if (httpTarget != null)
-        {
-            tags.AddAttributeHttpTarget(httpTarget, addIfEmpty: true);
-        }
-
-        if (urlPath != null)
-        {
-            tags.AddAttributeUrlPath(urlPath, addIfEmpty: true);
-        }
+        tags.AddAttributeHttpTarget(httpTarget, addIfEmpty: true);
+        tags.AddAttributeUrlPath(urlPath, addIfEmpty: true);
 
         if (urlQuery != null)
         {
@@ -84,14 +81,17 @@ internal static IEnumerable<KeyValuePair<string, object>> GetHttpTags<TInput>(TI
         if (httpMethod != null)
         {
             tags.AddAttributeHttpMethod(httpMethod, addIfEmpty: true);
+            tags.AddAttributeHttpRequestMethod(httpMethod, addIfEmpty: true);
         }
 
         if (hostName != null)
         {
             tags.AddAttributeNetHostName(hostName, addIfEmpty: true);
+            tags.AddAttributeServerAddress(hostName, addIfEmpty: true);
         }
 
         tags.AddAttributeNetHostPort(hostPort);
+        tags.AddAttributeServerPort(hostPort);
 
         return tags;
     }
@@ -107,12 +107,15 @@ internal static void SetHttpTagsFromResult(Activity? activity, object? result)
         {
             case APIGatewayProxyResponse response:
                 activity.SetTagAttributeHttpStatusCode(response.StatusCode);
+                activity.SetTagAttributeHttpResponseStatusCode(response.StatusCode);
                 break;
             case APIGatewayHttpApiV2ProxyResponse responseV2:
                 activity.SetTagAttributeHttpStatusCode(responseV2.StatusCode);
+                activity.SetTagAttributeHttpResponseStatusCode(responseV2.StatusCode);
                 break;
             case ApplicationLoadBalancerResponse albResponse:
                 activity.SetTagAttributeHttpStatusCode(albResponse.StatusCode);
+                activity.SetTagAttributeHttpResponseStatusCode(albResponse.StatusCode);
                 break;
             default:
                 break;

src/Shared/AWS/AWSSemanticConventions.Base.cs

@@ -142,22 +142,28 @@ private abstract class AWSSemanticConventionsBase
 
         // HTTP Attributes
         /// <inheritdoc cref="HttpAttributes.AttributeHttpStatusCode"/>
+        [Obsolete("Replaced by <c>http.response.status_code</c>.")]
         public virtual string AttributeHttpStatusCode => string.Empty;
         /// <inheritdoc cref="HttpAttributes.AttributeHttpResponseStatusCode"/>
         public virtual string AttributeHttpResponseStatusCode => string.Empty;
         /// <inheritdoc cref="HttpAttributes.AttributeHttpScheme"/>
+        [Obsolete("Replaced by <c>url.scheme</c> instead.")]
         public virtual string AttributeHttpScheme => string.Empty;
         /// <inheritdoc cref="HttpAttributes.AttributeHttpTarget"/>
+        [Obsolete("Split to <c>url.path</c> and `url.query.")]
         public virtual string AttributeHttpTarget => string.Empty;
         /// <inheritdoc cref="HttpAttributes.AttributeHttpMethod"/>
+        [Obsolete("Replaced by <c>http.request.method</c>.")]
         public virtual string AttributeHttpMethod => string.Empty;
         /// <inheritdoc cref="HttpAttributes.AttributeHttpRequestMethod"/>
         public virtual string AttributeHttpRequestMethod => string.Empty;
 
         // NET Attributes
         /// <inheritdoc cref="NetAttributes.AttributeNetHostName"/>
+        [Obsolete("Replaced by <c>server.address</c>.")]
         public virtual string AttributeNetHostName => string.Empty;
         /// <inheritdoc cref="NetAttributes.AttributeNetHostPort"/>
+        [Obsolete("Replaced by <c>server.port</c>.")]
         public virtual string AttributeNetHostPort => string.Empty;
 
         // SERVER Attributes

src/Shared/AWS/AWSSemanticConventions.cs

@@ -235,28 +235,42 @@ public static T AddAttributeHostName<T>(this T attributes, object? value, bool a
 
     #region Http
     /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeHttpStatusCode"/>
+    [Obsolete("Replaced by <c>http.response.status_code</c>.")]
     public static Activity? SetTagAttributeHttpStatusCode(this Activity? activity, int value)
         => SetTag(activity, x => x.AttributeHttpStatusCode, value);
 
+    /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeHttpResponseStatusCode"/>
+    public static Activity? SetTagAttributeHttpResponseStatusCode(this Activity? activity, int value)
+        => SetTag(activity, x => x.AttributeHttpResponseStatusCode, value);
+
     /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeHttpScheme"/>
+    [Obsolete("Replaced by <c>url.scheme</c> instead.")]
     public static T AddAttributeHttpScheme<T>(this T attributes, object? value, bool addIfEmpty = false)
         where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeHttpScheme, value, addIfEmpty);
 
     /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeHttpTarget"/>
+    [Obsolete("Split to <c>url.path</c> and `url.query.")]
     public static T AddAttributeHttpTarget<T>(this T attributes, object? value, bool addIfEmpty = false)
         where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeHttpTarget, value, addIfEmpty);
 
     /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeHttpMethod"/>
+    [Obsolete("Replaced by <c>http.request.method</c>.")]
     public static T AddAttributeHttpMethod<T>(this T attributes, object? value, bool addIfEmpty = false)
         where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeHttpMethod, value, addIfEmpty);
+
+    /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeHttpRequestMethod"/>
+    public static T AddAttributeHttpRequestMethod<T>(this T attributes, object? value, bool addIfEmpty = false)
+        where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeHttpRequestMethod, value, addIfEmpty);
     #endregion
 
     #region Net
     /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeNetHostName"/>
+    [Obsolete("Replaced by <c>server.address</c>.")]
     public static T AddAttributeNetHostName<T>(this T attributes, object? value, bool addIfEmpty = false)
         where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeNetHostName, value, addIfEmpty);
 
     /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeNetHostPort"/>
+    [Obsolete("Replaced by <c>server.port</c>.")]
     public static T AddAttributeNetHostPort<T>(this T attributes, object? value, bool addIfEmpty = false)
         where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeNetHostPort, value, addIfEmpty);
     #endregion
@@ -267,6 +281,16 @@ public static T AddAttributeK8SClusterName<T>(this T attributes, object? value,
         where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeK8SClusterName, value, addIfEmpty);
     #endregion
 
+    #region Server
+    /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeServerAddress"/>
+    public static T AddAttributeServerAddress<T>(this T attributes, object? value, bool addIfEmpty = false)
+        where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeServerAddress, value, addIfEmpty);
+
+    /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeServerPort"/>
+    public static T AddAttributeServerPort<T>(this T attributes, object? value, bool addIfEmpty = false)
+        where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeServerPort, value, addIfEmpty);
+    #endregion
+
     #region Service
     /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeServiceName"/>
     public static T AddAttributeServiceNameIsAwsElasticBeanstalk<T>(this T attributes)
@@ -293,6 +317,10 @@ public static T AddAttributeUrlPath<T>(this T attributes, object? value, bool ad
     /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeServiceName"/>
     public static T AddAttributeUrlQuery<T>(this T attributes, object? value, bool addIfEmpty = false)
         where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeUrlQuery, value, addIfEmpty);
+
+    /// <inheritdoc cref="AWSSemanticConventionsBase.AttributeUrlScheme"/>
+    public static T AddAttributeUrlScheme<T>(this T attributes, object? value, bool addIfEmpty = false)
+        where T : IList<KeyValuePair<string, object>> => Add(attributes, x => x.AttributeUrlScheme, value, addIfEmpty);
     #endregion
 
     private static T Add<T>(this T attributes, Func<AWSSemanticConventionsBase, string> attributeNameFunc, Func<AWSSemanticConventionsBase, string> valueFunc)

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

@@ -83,13 +83,19 @@ private class AWSSemanticConventions_v1_27_0 : AWSSemanticConventionsBase
         public override string AttributeHostName => "host.name";
 
         // HTTP Attributes
+        [Obsolete("Replaced by <c>http.response.status_code</c>.")]
         public override string AttributeHttpStatusCode => "http.status_code";
+        [Obsolete("Replaced by <c>url.scheme</c> instead.")]
         public override string AttributeHttpScheme => "http.scheme";
+        [Obsolete("Split to <c>url.path</c> and `url.query.")]
         public override string AttributeHttpTarget => "http.target";
+        [Obsolete("Replaced by <c>http.request.method</c>.")]
         public override string AttributeHttpMethod => "http.method";
 
         // NET Attributes
+        [Obsolete("Replaced by <c>server.address</c>.")]
         public override string AttributeNetHostName => "net.host.name";
+        [Obsolete("Replaced by <c>server.port</c>.")]
         public override string AttributeNetHostPort => "net.host.port";
 
         // K8s Attributes

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

@@ -27,17 +27,23 @@ private class AWSSemanticConventions_v1_29_0 : AWSSemanticConventions_v1_27_0
         public override string AttributeFaasExecution => "faas.invocation_id";
 
         // HTTP Attributes
-        public override string AttributeHttpStatusCode => this.AttributeHttpResponseStatusCode;
-        public override string AttributeHttpScheme => this.AttributeUrlScheme;
+        [Obsolete("Replaced by <c>http.response.status_code</c>.")]
+        public override string AttributeHttpStatusCode => string.Empty; // value no longer written
+        [Obsolete("Replaced by <c>url.scheme</c> instead.")]
+        public override string AttributeHttpScheme => string.Empty; // value no longer written
 
+        [Obsolete("Split to <c>url.path</c> and `url.query.")]
         public override string AttributeHttpTarget => string.Empty; // value no longer written
-        public override string AttributeHttpMethod => this.AttributeHttpRequestMethod;
+        [Obsolete("Replaced by <c>http.request.method</c>.")]
+        public override string AttributeHttpMethod => string.Empty; // value no longer written
         public override string AttributeHttpResponseStatusCode => "http.response.status_code";
         public override string AttributeHttpRequestMethod => "http.request.method";
 
         // NET Attributes
-        public override string AttributeNetHostName => this.AttributeServerAddress;
-        public override string AttributeNetHostPort => this.AttributeServerPort;
+        [Obsolete("Replaced by <c>server.address</c>.")]
+        public override string AttributeNetHostName => string.Empty; // value no longer written
+        [Obsolete("Replaced by <c>server.port</c>.")]
+        public override string AttributeNetHostPort => string.Empty; // value no longer written
 
         // SERVER Attributes
         public override string AttributeServerAddress => "server.address";