From 74df0df2e40bed9ad83ae195cb6fe48d5024cbc0 Mon Sep 17 00:00:00 2001
From: Alan West <3676547+alanwest@users.noreply.github.com>
Date: Wed, 25 May 2022 16:41:32 -0700
Subject: [PATCH] Move JSON serialization to projects that need it

---
 .../Implementation/JaegerTagTransformer.cs                 | 4 ++++
 .../Implementation/ZipkinTagTransformer.cs                 | 4 ++++
 src/OpenTelemetry/Internal/TagTransformer.cs               | 3 +--
 src/OpenTelemetry/OpenTelemetry.csproj                     | 7 -------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagTransformer.cs b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagTransformer.cs
index 825a6b0e6d7..3852a6be165 100644
--- a/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagTransformer.cs
+++ b/src/OpenTelemetry.Exporter.Jaeger/Implementation/JaegerTagTransformer.cs
@@ -14,6 +14,7 @@
 // limitations under the License.
 // </copyright>
 
+using System;
 using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Exporter.Jaeger.Implementation
@@ -45,5 +46,8 @@ protected override JaegerTag TransformStringTag(string key, string value)
         {
             return new JaegerTag(key, JaegerTagType.STRING, vStr: value);
         }
+
+        protected override JaegerTag TransformArrayTag(string key, Array array)
+            => this.TransformStringTag(key, System.Text.Json.JsonSerializer.Serialize(array));
     }
 }
diff --git a/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinTagTransformer.cs b/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinTagTransformer.cs
index df0e7b29cab..4f960811761 100644
--- a/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinTagTransformer.cs
+++ b/src/OpenTelemetry.Exporter.Zipkin/Implementation/ZipkinTagTransformer.cs
@@ -14,6 +14,7 @@
 // limitations under the License.
 // </copyright>
 
+using System;
 using OpenTelemetry.Internal;
 
 namespace OpenTelemetry.Exporter.Zipkin.Implementation
@@ -33,5 +34,8 @@ private ZipkinTagTransformer()
         protected override string TransformBooleanTag(string key, bool value) => value ? "true" : "false";
 
         protected override string TransformStringTag(string key, string value) => value;
+
+        protected override string TransformArrayTag(string key, Array array)
+            => this.TransformStringTag(key, System.Text.Json.JsonSerializer.Serialize(array));
     }
 }
diff --git a/src/OpenTelemetry/Internal/TagTransformer.cs b/src/OpenTelemetry/Internal/TagTransformer.cs
index 5ad8a0ecf08..e63ccd623f9 100644
--- a/src/OpenTelemetry/Internal/TagTransformer.cs
+++ b/src/OpenTelemetry/Internal/TagTransformer.cs
@@ -101,8 +101,7 @@ public bool TryTransformTag(KeyValuePair<string, object> tag, out T result)
 
     protected abstract T TransformStringTag(string key, string value);
 
-    protected virtual T TransformArrayTag(string key, Array array) =>
-        this.TransformStringTag(key, System.Text.Json.JsonSerializer.Serialize(array));
+    protected abstract T TransformArrayTag(string key, Array array);
 
     private T TransformArrayTagInternal(string key, Array array)
     {
diff --git a/src/OpenTelemetry/OpenTelemetry.csproj b/src/OpenTelemetry/OpenTelemetry.csproj
index ecef799dc05..a247eba4f37 100644
--- a/src/OpenTelemetry/OpenTelemetry.csproj
+++ b/src/OpenTelemetry/OpenTelemetry.csproj
@@ -16,13 +16,6 @@
     <RunApiCompat>false</RunApiCompat>
   </PropertyGroup>
 
-  <!--These files are shared and included by other projects.
-      Excluding them from compilation because they introduce an unnecessary dependency on System.Text.Json. -->
-  <ItemGroup>
-    <Compile Remove="Internal\TagAndValueTransformer.cs" />
-    <Compile Remove="Internal\TagTransformer.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePkgVer)" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="$(SystemReflectionEmitLightweightPkgVer)" />