Upgrade analytics-sdk to 3.2.0

snowplow-incubator · Dec 1, 2023 · 9aaa298 · 9aaa298
1 parent 972e1bb
commit 9aaa298
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 13 deletions.
diff --git a/...src/test/scala/com.snowplowanalytics.snowplow.loaders/transform/SkippingSchemasSpec.scala b/...src/test/scala/com.snowplowanalytics.snowplow.loaders/transform/SkippingSchemasSpec.scala
@@ -45,8 +45,14 @@ class SkippingSchemasSpec extends Specification {
       shouldNotExist = List.empty,
       shouldExist = List(
         NamedValue(name = "unstruct_event_com_example_my_schema_1", value = json"""{"field": "ue1"}"""),
-        NamedValue(name = "contexts_com_example_my_schema_2", value       = json"""[{"field": "c1"}]"""),
-        NamedValue(name = "contexts_com_example_my_schema_3", value       = json"""[{"field": "dc1"}]""")
+        NamedValue(
+          name  = "contexts_com_example_my_schema_2",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/2-0-0", "field": "c1"}]"""
+        ),
+        NamedValue(
+          name  = "contexts_com_example_my_schema_3",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/3-0-0", "field": "dc1"}]"""
+        )
       )
     )
   }
@@ -64,8 +70,14 @@ class SkippingSchemasSpec extends Specification {
       shouldNotExist = List.empty,
       shouldExist = List(
         NamedValue(name = "unstruct_event_com_example_my_schema_1", value = json"""{"field": "ue1"}"""),
-        NamedValue(name = "contexts_com_example_my_schema_2", value       = json"""[{"field": "c1"}]"""),
-        NamedValue(name = "contexts_com_example_my_schema_3", value       = json"""[{"field": "dc1"}]""")
+        NamedValue(
+          name  = "contexts_com_example_my_schema_2",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/2-0-0", "field": "c1"}]"""
+        ),
+        NamedValue(
+          name  = "contexts_com_example_my_schema_3",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/3-0-0", "field": "dc1"}]"""
+        )
       )
     )
   }
@@ -103,8 +115,14 @@ class SkippingSchemasSpec extends Specification {
         "unstruct_event_com_example_my_schema_1"
       ),
       shouldExist = List(
-        NamedValue(name = "contexts_com_example_my_schema_2", value = json"""[{"field": "c1"}]"""),
-        NamedValue(name = "contexts_com_example_my_schema_3", value = json"""[{"field": "dc1"}]""")
+        NamedValue(
+          name  = "contexts_com_example_my_schema_2",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/2-0-0", "field": "c1"}]"""
+        ),
+        NamedValue(
+          name  = "contexts_com_example_my_schema_3",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/3-0-0", "field": "dc1"}]"""
+        )
       )
     )
   }
@@ -127,8 +145,14 @@ class SkippingSchemasSpec extends Specification {
       ),
       shouldExist = List(
         // There is still '_2' column because 2-0-0 is skipped, but 2-1-0 with c2 value is not
-        NamedValue(name = "contexts_com_example_my_schema_2", value = json"""[{"field": "c2"}]"""),
-        NamedValue(name = "contexts_com_example_my_schema_3", value = json"""[{"field": "dc1"}]""")
+        NamedValue(
+          name  = "contexts_com_example_my_schema_2",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/2-1-0", "field": "c2"}]"""
+        ),
+        NamedValue(
+          name  = "contexts_com_example_my_schema_3",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/3-0-0", "field": "dc1"}]"""
+        )
       )
     )
   }
@@ -151,7 +175,11 @@ class SkippingSchemasSpec extends Specification {
       ),
       shouldExist = List(
         NamedValue(name = "unstruct_event_com_example_my_schema_1", value = json"""{"field": "ue1"}"""),
-        NamedValue(name = "contexts_com_example_my_schema_2", value       = json"""[{"field": "c1"}, {"field": "c2"}]""")
+        NamedValue(
+          name = "contexts_com_example_my_schema_2",
+          value = json"""[{"_schema_version" : "iglu:com.example/mySchema/jsonschema/2-0-0", "field": "c1"}, 
+                          {"_schema_version" : "iglu:com.example/mySchema/jsonschema/2-1-0", "field": "c2"}]"""
+        )
       )
     )
   }

diff --git a/...ommon/src/test/scala/com.snowplowanalytics.snowplow.loaders/transform/TransformSpec.scala b/...ommon/src/test/scala/com.snowplowanalytics.snowplow.loaders/transform/TransformSpec.scala
@@ -152,8 +152,26 @@ class TransformSpec extends Specification {
     val result = Transform.transformEventUnstructured(badProcessor, TestCaster, TestCirceFolder, event, schemasToSkip)
 
     val expected = List(
-      NamedValue("contexts_com_example_my_schema_7", Json.fromValues(List(data1))),
-      NamedValue("contexts_com_example_my_schema_8", Json.fromValues(List(data2)))
+      NamedValue(
+        name = "contexts_com_example_my_schema_7",
+        value = json"""
+              [{
+                "_schema_version" : "iglu:com.example/mySchema/jsonschema/7-0-1",
+                "my_string": "abc",
+                "my_int":     42
+              }]
+              """
+      ),
+      NamedValue(
+        name = "contexts_com_example_my_schema_8",
+        value = json"""
+              [{
+                "_schema_version" : "iglu:com.example/mySchema/jsonschema/8-0-1",
+                "my_string": "xyz",
+                "my_int":     123 
+              }]
+              """
+      )
     )
 
     result must beRight { namedValues: List[NamedValue[Json]] =>
@@ -193,7 +211,21 @@ class TransformSpec extends Specification {
 
     val result = Transform.transformEventUnstructured(badProcessor, TestCaster, TestCirceFolder, event, schemasToSkip)
 
-    val expected = NamedValue("contexts_com_example_my_schema_7", Json.fromValues(List(data1, data2)))
+    val expected = NamedValue(
+      name = "contexts_com_example_my_schema_7",
+      value = json"""
+            [{
+              "_schema_version" : "iglu:com.example/mySchema/jsonschema/7-0-1",
+              "my_string": "abc",
+              "my_int":     42
+            },
+            {
+              "_schema_version" : "iglu:com.example/mySchema/jsonschema/7-0-2",
+              "my_string": "xyz",
+              "my_int":     123 
+            }]
+            """
+    )
 
     result must beRight { namedValues: List[NamedValue[Json]] =>
       namedValues must contain(expected).exactly(1.times)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -42,7 +42,7 @@ object Dependencies {
     val badrows      = "2.3.0"
     val igluClient   = "3.1.0"
     val tracker      = "2.0.0"
-    val analyticsSdk = "3.1.0"
+    val analyticsSdk = "3.2.0"
 
     // Transitive overrides
     val snappy = "1.1.10.2"