Enable handling of non-string attributes in Zipkin tests

open-telemetry · Aug 26, 2020 · c88120d · c88120d
1 parent 891051c
commit c88120d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...lemetry.Exporter.Zipkin.Tests/Implementation/ZipkinActivityExporterRemoteEndpointTests.cs b/...lemetry.Exporter.Zipkin.Tests/Implementation/ZipkinActivityExporterRemoteEndpointTests.cs
@@ -59,7 +59,9 @@ public void ZipkinSpanConverterTest_GenerateActivity_RemoteEndpointResolution()
         public void ZipkinSpanConverterTest_GenerateActivity_RemoteEndpointResolutionPriority(RemoteEndpointPriorityTestCase testCase)
         {
             // Arrange
-            var activity = ZipkinExporterTests.CreateTestActivity(additionalAttributes: testCase.RemoteEndpointAttributes);
+            var activity = ZipkinExporterTests.CreateTestActivity(
+                additionalAttributes: testCase.RemoteEndpointAttributes,
+                convertAttributeValuesToString: false);
 
             // Act & Assert
             var zipkinSpan = ZipkinActivityConversionExtensions.ToZipkinSpan(activity, DefaultZipkinEndpoint);

diff --git a/test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs b/test/OpenTelemetry.Exporter.Zipkin.Tests/ZipkinExporterTests.cs
@@ -177,6 +177,7 @@ public void ZipkinExporterIntegrationTest(bool useShortTraceIds)
         internal static Activity CreateTestActivity(
            bool setAttributes = true,
            Dictionary<string, object> additionalAttributes = null,
+           bool convertAttributeValuesToString = true,
            bool addEvents = true,
            bool addLinks = true,
            Resource resource = null,
@@ -228,9 +229,14 @@ internal static Activity CreateTestActivity(
 
             var activitySource = new ActivitySource(nameof(CreateTestActivity));
 
-            var tags = setAttributes ?
-                    attributes.Select(kvp => new KeyValuePair<string, object>(kvp.Key, kvp.Value.ToString()))
-                    : null;
+            IEnumerable<KeyValuePair<string, object>> tags = null;
+            if (setAttributes)
+            {
+                tags = convertAttributeValuesToString
+                    ? attributes.Select(kvp => new KeyValuePair<string, object>(kvp.Key, kvp.Value.ToString()))
+                    : attributes.Select(kvp => new KeyValuePair<string, object>(kvp.Key, kvp.Value));
+            }
+
             var links = addLinks ?
                     new[]
                     {