Add DD_TRACE_GLOBAL_TAGS Configuration Option

src/Datadog.Trace/Configuration/CompositeConfigurationSource.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -98,5 +99,12 @@ IEnumerator IEnumerable.GetEnumerator()
         {
             return _sources.GetEnumerator();
         }
+
+        /// <inheritdoc />
+        public IDictionary<string, string> GetDictionary(string key)
+        {
+            return _sources.Select(source => source.GetDictionary(key))
+                        .FirstOrDefault(value => value != null);
+        }
     }
 }

src/Datadog.Trace/Configuration/ConfigurationKeys.cs

@@ -77,6 +77,11 @@ public static class ConfigurationKeys
         /// <seealso cref="TracerSettings.AnalyticsEnabled"/>
         public const string GlobalAnalyticsEnabled = "DD_TRACE_ANALYTICS_ENABLED";
 
+        /// <summary>
+        /// Configuration key for a list of tags to be applied globally to spans.
+        /// </summary>
+        public const string GlobalTags = "DD_TRACE_GLOBAL_TAGS";
+
         /// <summary>
         /// Configuration key for enabling or disabling the automatic injection
         /// of correlation identifiers into the logging context.

src/Datadog.Trace/Configuration/IConfigurationSource.cs

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace Datadog.Trace.Configuration
 {
     /// <summary>
@@ -36,5 +38,13 @@ public interface IConfigurationSource
         /// <param name="key">The key that identifies the setting.</param>
         /// <returns>The value of the setting, or <c>null</c> if not found.</returns>
         bool? GetBool(string key);
-    }
+
+        /// <summary>
+        /// Gets the <see cref="IDictionary{TKey, TValue}"/> value of
+        /// the setting with the specified key.
+        /// </summary>
+        /// <param name="key">The key that identifies the setting.</param>
+        /// <returns>The value of the setting, or <c>null</c> if not found.</returns>
+        IDictionary<string, string> GetDictionary(string key);
+   }
 }

src/Datadog.Trace/Configuration/JsonConfigurationSource.cs

@@ -1,3 +1,5 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.IO;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -97,5 +99,40 @@ public T GetValue<T>(string key)
                        ? default
                        : token.Value<T>();
         }
+
+        /// <summary>
+        /// Gets a <see cref="ConcurrentDictionary{TKey, TValue}"/> containing all of the values.
+        /// </summary>
+        /// <remarks>
+        /// Example JSON where `globalTags` is the configuration key.
+        /// {
+        ///  "globalTags": {
+        ///     "name1": "value1",
+        ///     "name2": "value2"
+        ///     }
+        /// }
+        /// </remarks>
+        /// <param name="key">The key that identifies the setting.</param>
+        /// <returns><see cref="IDictionary{TKey, TValue}"/> containing all of the key-value pairs.</returns>
+        /// <exception cref="JsonReaderException">Thrown if the configuration value is not a valid JSON string.</exception>"
+        public IDictionary<string, string> GetDictionary(string key)
+        {
+            var token = _configuration.SelectToken(key, errorWhenNoMatch: false);
+            if (token == null)
+            {
+                return null;
+            }
+
+            // Presence of a curly brace indicates that this is likely a JSON string. An exception will be thrown
+            // if it fails to parse or convert to a dictionary.
+            if (token.ToString().Contains("{"))
+            {
+                var dictionary = JToken.Parse(token.ToString())
+                    ?.ToObject(typeof(ConcurrentDictionary<string, string>)) as ConcurrentDictionary<string, string>;
+                return dictionary;
+            }
+
+            return StringConfigurationSource.ParseCustomKeyValues(token.ToString());
+        }
     }
 }

src/Datadog.Trace/Configuration/StringConfigurationSource.cs

@@ -1,3 +1,6 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+
 namespace Datadog.Trace.Configuration
 {
     /// <summary>
@@ -6,6 +9,39 @@ namespace Datadog.Trace.Configuration
     /// </summary>
     public abstract class StringConfigurationSource : IConfigurationSource
     {
+        /// <summary>
+        /// Returns a <see cref="IDictionary{TKey, TValue}"/> from parsing
+        /// <paramref name="data"/>.
+        /// </summary>
+        /// <param name="data">A string containing key-value pairs which are comma-separated, and for which the key and value are colon-separated.</param>
+        /// <returns><see cref="IDictionary{TKey, TValue}"/> of key value pairs.</returns>
+        public static IDictionary<string, string> ParseCustomKeyValues(string data)
+        {
+            var dictionary = new ConcurrentDictionary<string, string>();
+
+            if (data == null)
+            {
+                return dictionary;
+            }
+
+            var entries = data.Split(',');
+
+            foreach (var e in entries)
+            {
+                var kv = e.Split(':');
+                if (kv.Length != 2)
+                {
+                    continue;
+                }
+
+                var key = kv[0];
+                var value = kv[1];
+                dictionary[key] = value;
+            }
+
+            return dictionary;
+        }
+
         /// <inheritdoc />
         public abstract string GetString(string key);
 
@@ -38,5 +74,15 @@ public abstract class StringConfigurationSource : IConfigurationSource
                        ? result
                        : (bool?)null;
         }
+
+        /// <summary>
+        /// Gets a <see cref="ConcurrentDictionary{TKey, TValue}"/> from parsing
+        /// </summary>
+        /// <param name="key">The key</param>
+        /// <returns><see cref="ConcurrentDictionary{TKey, TValue}"/> containing all of the key-value pairs.</returns>
+        public IDictionary<string, string> GetDictionary(string key)
+        {
+            return ParseCustomKeyValues(GetString(key));
+        }
     }
 }

src/Datadog.Trace/Configuration/TracerSettings.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace Datadog.Trace.Configuration
 {
@@ -76,6 +78,9 @@ public TracerSettings(IConfigurationSource source)
                                false;
 
             Integrations = new IntegrationSettingsCollection(source);
+
+            GlobalTags = source?.GetDictionary(ConfigurationKeys.GlobalTags) as ConcurrentDictionary<string, string> ??
+                new ConcurrentDictionary<string, string>();
         }
 
         /// <summary>
@@ -141,6 +146,11 @@ public TracerSettings(IConfigurationSource source)
         /// </summary>
         public IntegrationSettingsCollection Integrations { get; }
 
+        /// <summary>
+        /// Gets or sets the global tags, which are applied to all <see cref="Span"/>s.
+        /// </summary>
+        public ConcurrentDictionary<string, string> GlobalTags { get; set; }
+
         /// <summary>
         /// Create a <see cref="TracerSettings"/> populated from the default sources
         /// returned by <see cref="CreateDefaultConfigurationSource"/>.

src/Datadog.Trace/IDatadogTracer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Datadog.Trace.Configuration;
 using Datadog.Trace.Sampling;
 
 namespace Datadog.Trace
@@ -14,6 +15,8 @@ internal interface IDatadogTracer
 
         ISampler Sampler { get; }
 
+        TracerSettings Settings { get; }
+
         Span StartSpan(string operationName, ISpanContext parent, string serviceName, DateTimeOffset? startTime, bool ignoreActiveScope);
 
         void Write(List<Span> span);

src/Datadog.Trace/Tracer.cs

@@ -217,6 +217,15 @@ public Span StartSpan(string operationName, ISpanContext parent = null, string s
                 span.SetTag(Tags.Env, env);
             }
 
+            // Apply any global tags
+            if (Settings.GlobalTags.Count > 0)
+            {
+                foreach (var entry in Settings.GlobalTags)
+                {
+                    span.SetTag(entry.Key, entry.Value);
+                }
+            }
+
             traceContext.AddSpan(span);
             return span;
         }

test/Datadog.Trace.ClrProfiler.IntegrationTests/Datadog.Trace.ClrProfiler.IntegrationTests.csproj

@@ -6,14 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\src\Datadog.Trace.ClrProfiler.Native\bin\$(Configuration)\$(Platform)\**"
-             CopyToOutputDirectory="Always"
-             CopyToPublishDirectory="Always"
-             Link="profiler-lib\%(RecursiveDir)\%(Filename)%(Extension)" />
-    <Content Include="..\..\integrations.json"
-             CopyToOutputDirectory="Always"
-             CopyToPublishDirectory="Always"
-             Link="profiler-lib\integrations.json" />
+    <None Include="..\..\src\Datadog.Trace.ClrProfiler.Native\bin\$(Configuration)\$(Platform)\**" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" Link="profiler-lib\%(RecursiveDir)\%(Filename)%(Extension)" />
+    <Content Include="..\..\integrations.json" CopyToOutputDirectory="Always" CopyToPublishDirectory="Always" Link="profiler-lib\integrations.json" />
   </ItemGroup>
 
   <ItemGroup>
@@ -24,4 +18,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
+
+  <ProjectExtensions><VisualStudio><UserProperties _1_1_4_1_1_4integrations_1json__JsonSchema="http://json.schemastore.org/ansible-stable-2.7" /></VisualStudio></ProjectExtensions>
 </Project>

test/Datadog.Trace.Tests/Configuration/ConfigurationSourceTests.cs

@@ -18,6 +18,7 @@ public static IEnumerable<object[]> GetDefaultTestData()
             yield return new object[] { CreateFunc(s => s.ServiceName), null };
             yield return new object[] { CreateFunc(s => s.DisabledIntegrationNames.Count), 0 };
             yield return new object[] { CreateFunc(s => s.LogsInjectionEnabled), false };
+            yield return new object[] { CreateFunc(s => s.GlobalTags.Count), 0 };
         }
 
         public static IEnumerable<object[]> GetTestData()
@@ -36,6 +37,20 @@ public static IEnumerable<object[]> GetTestData()
             yield return new object[] { ConfigurationKeys.ServiceName, "web-service", CreateFunc(s => s.ServiceName), "web-service" };
 
             yield return new object[] { ConfigurationKeys.DisabledIntegrations, "integration1;integration2", CreateFunc(s => s.DisabledIntegrationNames.Count), 2 };
+
+            yield return new object[] { ConfigurationKeys.GlobalTags, "k1:v1, k2:v2", CreateFunc(s => s.GlobalTags.Count), 2 };
+        }
+
+        // JsonConfigurationSource needs to be tested with JSON data, which cannot be used with the other IConfigurationSource implementations.
+        public static IEnumerable<object[]> GetJsonTestData()
+        {
+            yield return new object[] { ConfigurationKeys.GlobalTags, @"{ ""name1"":""value1"", ""name2"": ""value2""}", CreateFunc(s => s.GlobalTags.Count), 2 };
+        }
+
+        public static IEnumerable<object[]> GetBadJsonTestData()
+        {
+            // Extra opening brace
+            yield return new object[] { ConfigurationKeys.GlobalTags, @"{ {""name1"":""value1"", ""name2"": ""value2""}" };
         }
 
         public static Func<TracerSettings, object> CreateFunc(Func<TracerSettings, object> settingGetter)
@@ -90,7 +105,8 @@ public void EnvironmentConfigurationSource(
 
         [Theory]
         [MemberData(nameof(GetTestData))]
-        public void NameValueConfigurationSource1(
+        [MemberData(nameof(GetJsonTestData))]
+        public void JsonConfigurationSource(
             string key,
             string value,
             Func<TracerSettings, object> settingGetter,
@@ -104,5 +120,18 @@ public void NameValueConfigurationSource1(
             object actualValue = settingGetter(settings);
             Assert.Equal(expectedValue, actualValue);
         }
+
+        [Theory]
+        [MemberData(nameof(GetBadJsonTestData))]
+        public void JsonConfigurationSource_BadData(
+            string key,
+            string value)
+        {
+            var config = new Dictionary<string, string> { [key] = value };
+            string json = JsonConvert.SerializeObject(config);
+            IConfigurationSource source = new JsonConfigurationSource(json);
+
+            Assert.Throws<JsonReaderException>(() => { new TracerSettings(source); });
+        }
     }
 }

test/Datadog.Trace.Tests/Datadog.Trace.Tests.csproj

@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />

test/Datadog.Trace.Tests/TracerTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Datadog.Trace.Agent;