Merge branch 'master' into sink-file-loads-faster

mozilla · Apr 8, 2020 · 2a2f388 · 2a2f388
2 parents da7eb84 + bb3d8b8
commit 2a2f388
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ingestion-beam/src/main/java/com/mozilla/telemetry/transforms/NormalizeAttributes.java b/ingestion-beam/src/main/java/com/mozilla/telemetry/transforms/NormalizeAttributes.java
@@ -61,7 +61,8 @@ public static String normalizeOs(String name) {
       return WINDOWS;
     } else if (name.startsWith("Darwin")) {
       return MAC;
-    } else if (name.contains("Linux") || name.contains("BSD") || name.contains("SunOS")) {
+    } else if (name.contains("Linux") || name.contains("BSD") || name.contains("SunOS")
+        || name.contains("Solaris")) {
       return LINUX;
     } else if (name.startsWith("iOS") || name.contains("iPhone")) {
       return IOS;

diff --git a/ingestion-beam/src/test/java/com/mozilla/telemetry/util/NormalizeAttributesTest.java b/ingestion-beam/src/test/java/com/mozilla/telemetry/util/NormalizeAttributesTest.java
@@ -52,6 +52,7 @@ public void os() {
     assertEquals("Linux", NormalizeAttributes.normalizeOs("Linux"));
     assertEquals("Linux", NormalizeAttributes.normalizeOs("GNU/Linux"));
     assertEquals("Linux", NormalizeAttributes.normalizeOs("SunOS"));
+    assertEquals("Linux", NormalizeAttributes.normalizeOs("Solaris"));
     assertEquals("Linux", NormalizeAttributes.normalizeOs("FreeBSD"));
     assertEquals("Linux", NormalizeAttributes.normalizeOs("GNU/kFreeBSD"));
     assertEquals("Other", NormalizeAttributes.normalizeOs("AIX"));