* Add http.statusText attribute on spanEvent (optional)

* Update ActivityBridge to handle Client external http activity kind correctly

Author: tippmar-nr

src/Agent/NewRelic/Agent/Core/Attributes/AttributeDefinitionService.cs

@@ -63,6 +63,7 @@ public interface IAttributeDefinitions
         AttributeDefinition<string, string> HostDisplayName { get; }
         AttributeDefinition<string, string> HttpMethod { get; }
         AttributeDefinition<long?, long> HttpStatusCode { get; }
+        AttributeDefinition<string, string> HttpStatusText { get; }
         AttributeDefinition<Uri, string> HttpUrl { get; }
         AttributeDefinition<bool, bool> IsError { get; }
         AttributeDefinition<string, string> NameForSpan { get; }
@@ -439,6 +440,17 @@ public AttributeDefinition<TypeAttributeValue, string> GetTypeAttribute(TypeAttr
                 .WithConvert(x => x.GetValueOrDefault())                //This is ok b/c we check for null input earlier
                 .Build(_attribFilter));
 
+        private AttributeDefinition<string, string> _httpStatusText;
+        public AttributeDefinition<string, string> HttpStatusText => _httpStatusText ??=
+            AttributeDefinitionBuilder.CreateString("http.statusText", AttributeClassification.AgentAttributes)
+                .AppliesTo(AttributeDestinations.ErrorEvent)
+                .AppliesTo(AttributeDestinations.ErrorTrace)
+                .AppliesTo(AttributeDestinations.TransactionEvent)
+                .AppliesTo(AttributeDestinations.ErrorEvent)
+                .AppliesTo(AttributeDestinations.SpanEvent)
+                .AppliesTo(AttributeDestinations.TransactionTrace)
+                .Build(_attribFilter);
+
         private AttributeDefinition<string, string> _clientCrossProcessId;
         public AttributeDefinition<string, string> ClientCrossProcessId => _clientCrossProcessId ?? (_clientCrossProcessId =
             AttributeDefinitionBuilder.CreateString("client_cross_process_id", AttributeClassification.Intrinsics)

src/Agent/NewRelic/Agent/Core/OpenTelemetryBridge/ActivityBridge.cs

@@ -13,9 +13,11 @@
 using NewRelic.Agent.Core.Errors;
 using NewRelic.Agent.Core.Segments;
 using NewRelic.Agent.Core.Transactions;
+using NewRelic.Agent.Core.Utilities;
 using NewRelic.Agent.Extensions.Api.Experimental;
 using NewRelic.Agent.Extensions.Logging;
 using NewRelic.Agent.Extensions.Providers.Wrapper;
+using NewRelic.Agent.Extensions.SystemExtensions.Collections.Generic;
 
 namespace NewRelic.Agent.Core.OpenTelemetryBridge
 {
@@ -67,7 +69,7 @@ private bool TryCreateActivityListener()
             // TODO: Enforce that an appropriate minimum version of the DiagnosticSource assembly is loaded.
             if (assembly == null || (assembly.GetName().Version?.Major ?? 0) < 7)
             {
-                Log.Debug("DiagnosticSource assembly version < 7 is not compatible with OpenTelemetry Bridge. Not starting the activity listener.");
+                Log.Debug("DiagnosticSource assembly not found or version < 7 is not compatible with OpenTelemetry Bridge. Not starting the activity listener.");
                 return false;
             }
 
@@ -494,7 +496,7 @@ private static void ActivityStopped(object originalActivity, IAgent agent, IErro
 
             if (segment != null)
             {
-                AddActivityTagsToSegment(originalActivity, segment);
+                AddActivityTagsToSegment(originalActivity, segment, agent);
                 AddExceptionEventInformationToSegment(originalActivity, segment, errorService);
                 segment.End();
             }
@@ -506,14 +508,79 @@ private static void ActivityStopped(object originalActivity, IAgent agent, IErro
             }
         }
 
-        private static void AddActivityTagsToSegment(object originalActivity, ISegment segment)
+        private static void AddActivityTagsToSegment(object originalActivity, ISegment segment, IAgent agent)
         {
             dynamic activity = originalActivity;
-            foreach (var tag in activity.TagObjects)
+            ActivityKind activityKind = (ActivityKind)activity.Kind;
+            var tags = ((IEnumerable<KeyValuePair<string, object>>)activity.TagObjects).ToDictionary(t => t.Key, t => t.Value);
+            if (tags.Count == 0)
             {
-                // TODO: We may not want to add all tags to the segment. We may want to filter out some tags, especially
-                // the ones that we map to intrinsic or agent attributes.
-                segment.AddCustomAttribute((string)tag.Key, (object)tag.Value);
+                Log.Debug($"Activity {activity.Id} has no tags. Not adding tags to segment.");
+                return;
+            }
+
+            // based on activity kind, create the appropriate segment data
+            switch (activityKind)
+            {
+                case ActivityKind.Client:
+                    // could be an http call or a database call, so need to look for specific tags to decide
+                    if (tags.TryGetValue<string, string, object>("http.request.method", out var method) || tags.TryGetValue<string, string, object>("http.method", out method)) // it's an HTTP call
+                    {
+                        if (!tags.TryGetValue<string, string, object>("url.full", out var url) && !tags.TryGetValue<string, string, object>("http.url", out url))
+                        {
+                            Log.Debug($"Activity {activity.Id} with Activity.Kind {activityKind} is missing required tags for url. Not creating an ExternalSegmentData.");
+                            break;
+                        }
+                        if (string.IsNullOrEmpty(url) || string.IsNullOrEmpty(method))
+                        {
+                            Log.Debug($"Activity {activity.Id} with Activity.Kind {activityKind} is missing required tags for url and method. Not creating an ExternalSegmentData.");
+                            break;
+                        }
+
+                        Uri uri = new Uri(url);
+                        var externalSegmentData = new ExternalSegmentData(uri, method);
+                        // set the http status code
+                        if (tags.TryGetValue<int, string, object>("http.response.status_code", out var statusCode) || tags.TryGetValue<int, string, object>("http.status_code", out statusCode))
+                        {
+                            tags.TryGetValue<string, string, object>("http.status_text", out var statusText);
+                            externalSegmentData.SetHttpStatus(statusCode, statusText);
+                        }
+
+                        // check for AWS
+                        if (!string.IsNullOrEmpty(agent.Configuration.AwsAccountId))
+                        {
+                            if (tags.TryGetValue<string, string, object>("faas.invoked_name", out var awsName))
+                                segment.AddCloudSdkAttribute("cloud.platform", "aws_lambda");
+                            if (tags.TryGetValue<string, string, object>("faas.invoked_provider", out var awsProvider) && tags.TryGetValue<string, string, object>("aws.region", out var awsRegion))
+                                segment.AddCloudSdkAttribute("cloud.resource_id", $"arn:aws:lambda:{awsRegion}:{agent.Configuration.AwsAccountId}:function:{awsName}");
+                        }
+
+                        segment.GetExperimentalApi().SetSegmentData(externalSegmentData);
+                    }
+                    else if (tags.TryGetValue("db.system", out var dbType)) // it's a database call
+                    {
+                        // TODO: need IDatabaseService here so we can create a DatastoreSegmentData instance.
+                        //var dbSegmentData = new DatastoreSegmentData( );
+                        //segment.GetExperimentalApi().SetSegmentData(dbSegmentData);
+                    }
+                    else
+                    {
+                        Log.Debug($"Activity {activity.Id} with Activity.Kind {activityKind} is missing required tags to determine whether it's an HTTP or database activity.");
+                    }
+                    break;
+                case ActivityKind.Internal:
+                case ActivityKind.Server:
+                case ActivityKind.Producer:
+                case ActivityKind.Consumer:
+                default:
+                    // as a fallback, add all tags to the segment as custom attributes if we did not create a specific segment data type.
+                    foreach (var tag in tags)
+                    {
+                        // TODO: We may not want to add all tags to the segment. We may want to filter out some tags, especially
+                        // the ones that we map to intrinsic or agent attributes.
+                        segment.AddCustomAttribute(tag.Key, tag.Value);
+                    }
+                    break;
             }
         }
 
@@ -674,6 +741,8 @@ public RuntimeNewRelicActivity(object activity)
             _dynamicActivity = (dynamic)_activity;
         }
 
+        public dynamic DynamicActivity => _dynamicActivity;
+
         public bool IsStopped => (bool?)(_dynamicActivity)?.IsStopped ?? true;
 
         public string SpanId => (string)(_dynamicActivity)?.SpanId.ToString();
@@ -682,6 +751,12 @@ public RuntimeNewRelicActivity(object activity)
 
         public string DisplayName => (string)(_dynamicActivity)?.DisplayName;
 
+        /// <summary>
+        /// Gets the ActivityKind for the activity. Can be safely cast to ActivityKind when needed.
+        /// Defaults to Internal if there's no dynamic activity
+        /// </summary>
+        public int Kind => (int?)(_dynamicActivity)?.Kind ?? (int)ActivityKind.Internal;
+
         public void Dispose()
         {
             _dynamicActivity?.Dispose();

src/Agent/NewRelic/Agent/Core/Segments/ExternalSegmentData.cs

@@ -20,6 +20,7 @@ public class ExternalSegmentData : AbstractSegmentData, IExternalSegmentData
         private const string TransactionGuidSegmentParameterKey = "transaction_guid";
 
         private int? _httpStatusCode;
+        private string _httpStatusText;
 
         public override SpanCategory SpanCategory => SpanCategory.Http;
 
@@ -36,9 +37,10 @@ public ExternalSegmentData(Uri uri, string method, CrossApplicationResponseData
 
         public CrossApplicationResponseData CrossApplicationResponseData { get; set; }
 
-        public void SetHttpStatusCode(int httpStatusCode)
+        public void SetHttpStatus(int httpStatusCode, string httpStatusText = null)
         {
             _httpStatusCode = httpStatusCode;
+            _httpStatusText = httpStatusText;
         }
 
         internal override IEnumerable<KeyValuePair<string, object>> Finish()
@@ -92,6 +94,7 @@ public override void SetSpanTypeSpecificAttributes(SpanAttributeValueCollection
             AttribDefs.Component.TrySetValue(attribVals, _segmentState.TypeName);
             AttribDefs.SpanKind.TrySetDefault(attribVals);
             AttribDefs.HttpStatusCode.TrySetValue(attribVals, _httpStatusCode);   //Attrib handles null
+            AttribDefs.HttpStatusText.TrySetValue(attribVals, _httpStatusText);
             AttribDefs.ServerAddress.TrySetValue(attribVals, Uri.Host);
             AttribDefs.ServerPort.TrySetValue(attribVals, Uri.Port);
         }

src/Agent/NewRelic/Agent/Core/Transactions/Transaction.cs

@@ -261,9 +261,11 @@ private Segment StartSegmentImpl(string typeName, string methodName, int invocat
         public ISegment StartActivitySegment(MethodCall methodCall, INewRelicActivity activity)
         {
             var segment = StartSegmentImpl(methodCall, activity);
-            var segmentData = new SimpleSegmentData(activity.DisplayName);
 
-            segment.SetSegmentData(segmentData);
+            // create a simple segment data with the activity's display name
+            // this will likely get replaced with a more specific segment data when the activity is stopped
+            var simpleSegmentData = new SimpleSegmentData(activity.DisplayName);
+            segment.SetSegmentData(simpleSegmentData);
 
             if (Log.IsFinestEnabled) LogFinest($"Segment start {{{segment.ToStringForFinestLogging()}}}");
 

src/Agent/NewRelic/Agent/Core/Utilities/DictionaryExtensions.cs

@@ -98,5 +98,20 @@ public static ReadOnlyDictionary<TKey, TValue> CopyToReadOnly<TKey, TValue>(this
         {
             return new ReadOnlyDictionary<TKey, TValue>(new Dictionary<TKey, TValue>(source));
         }
+
+        /// <summary>
+        /// Attempts to get a value from the dictionary and cast it to the specified type.
+        /// </summary>
+        public static bool TryGetValue<TResult, TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, out TResult defaultValue)
+        {
+            if (dictionary.TryGetValue(key, out var value) && value is TResult typedValue)
+            {
+                defaultValue = typedValue;
+                return true;
+            }
+
+            defaultValue = default;
+            return false;
+        }
     }
 }

src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/Experimental/IExternalSegmentData.cs

@@ -9,6 +9,6 @@ namespace NewRelic.Agent.Api.Experimental
     /// </summary>
     public interface IExternalSegmentData : ISegmentData
     {
-        void SetHttpStatusCode(int httpStatusCode);
+        void SetHttpStatus(int httpStatusCode, string httpStatusText = null);
     }
 }

src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/Experimental/INewRelicActivity.cs

@@ -8,10 +8,17 @@ namespace NewRelic.Agent.Extensions.Api.Experimental
 {
     public interface INewRelicActivity : IDisposable
     {
+        /// <summary>
+        /// Gets the underlying activity as a dynamic type.
+        /// Provides a way to access properties that are not directly exposed in this interface
+        /// </summary>
+        dynamic DynamicActivity { get; }
+
         string SpanId { get; }
         string TraceId { get; }
         string DisplayName { get; }
         bool IsStopped { get; }
+        int Kind { get; }
 
         // can't use a Segment {get; set;} property here because it causes a circular reference between Activity and Segment
         void SetSegment(ISegment segment);

src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpClient/SendAsync.cs

@@ -174,7 +174,7 @@ private static void TryProcessResponse(IAgent agent, HttpResponseMessage respons
                 }
 
                 var httpStatusCode = response.StatusCode;
-                externalSegmentData.SetHttpStatusCode((int)httpStatusCode);
+                externalSegmentData.SetHttpStatus((int)httpStatusCode);
 
                 // Everything after this is for CAT, so bail if we're not using it
                 if (agent.Configuration.DistributedTracingEnabled || !agent.Configuration.CrossApplicationTracingEnabled)

src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/HttpWebRequest/GetResponseWrapper.cs

@@ -65,7 +65,7 @@ private static void TryProcessResponse(WebResponse response, ITransaction transa
             var statusCode = httpWebResponse?.StatusCode;
             if (statusCode.HasValue)
             {
-                externalSegmentData.SetHttpStatusCode((int)statusCode.Value);
+                externalSegmentData.SetHttpStatus((int)statusCode.Value);
             }
 
             var headers = response?.Headers?.ToDictionary();

src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/RestSharp/ExecuteTaskAsync.cs

@@ -72,7 +72,7 @@ private static void TryProcessResponse(IAgent agent, Task responseTask, ITransac
                 var statusCode = RestSharpHelper.GetResponseStatusCode(restResponse);
                 if (statusCode != 0)
                 {
-                    externalSegmentData.SetHttpStatusCode(statusCode);
+                    externalSegmentData.SetHttpStatus(statusCode);
                 }
 
                 var headers = RestSharpHelper.GetResponseHeaders(restResponse);