feat: add support for channel object in individual payload (#41)

Now `channel = server` will be added along with each message payload.
rudderlabs · Dec 19, 2022 · 97ca4ca · 97ca4ca
1 parent d149901
commit 97ca4ca
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 2 deletions.
diff --git a/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/AliasMessage.java b/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/AliasMessage.java
@@ -58,6 +58,7 @@ protected AliasMessage realBuild(
         Type type,
         String messageId,
         Date sentAt,
+        String channel,
         Date timestamp,
         Map<String, ?> context,
         String anonymousId,
@@ -67,6 +68,7 @@ protected AliasMessage realBuild(
           type,
           messageId,
           sentAt,
+          channel,
           timestamp,
           context,
           anonymousId,

diff --git a/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/GroupMessage.java b/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/GroupMessage.java
@@ -78,6 +78,7 @@ protected GroupMessage realBuild(
         Type type,
         String messageId,
         Date sentAt,
+        String channel,
         Date timestamp,
         Map<String, ?> context,
         String anonymousId,
@@ -87,6 +88,7 @@ protected GroupMessage realBuild(
           type,
           messageId,
           sentAt,
+          channel,
           timestamp,
           context,
           anonymousId,

diff --git a/...ytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/IdentifyMessage.java b/...ytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/IdentifyMessage.java
@@ -62,6 +62,7 @@ protected IdentifyMessage realBuild(
         Type type,
         String messageId,
         Date sentAt,
+        String channel,
         Date timestamp,
         Map<String, ?> context,
         String anonymousId,
@@ -72,7 +73,7 @@ protected IdentifyMessage realBuild(
       }
 
       return new AutoValue_IdentifyMessage(
-          type, messageId, sentAt, timestamp, context, anonymousId, userId, integrations, traits);
+          type, messageId, sentAt, channel, timestamp, context, anonymousId, userId, integrations, traits);
     }
 
     @Override

diff --git a/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/Message.java b/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/Message.java
@@ -29,6 +29,9 @@ public interface Message {
   @Nullable
   Date sentAt();
 
+  @Nonnull
+  String channel();
+
   @Nonnull
   Date timestamp();
 

diff --git a/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/MessageBuilder.java b/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/MessageBuilder.java
@@ -201,6 +201,7 @@ protected abstract T realBuild(
       Message.Type type,
       String messageId,
       Date sentAt,
+      String channel,
       Date timestamp,
       Map<String, ?> context,
       String anonymousId,
@@ -231,6 +232,8 @@ public T build() {
       messageId = UUID.randomUUID().toString();
     }
 
+    String channel = "server";
+
     Map<String, Object> integrations;
     if (this.integrations == null) {
       integrations = Collections.emptyMap();
@@ -247,7 +250,7 @@ public T build() {
     }
 
     return realBuild(
-        type, messageId, sentAt, timestamp, context, anonymousId, userId, integrations);
+        type, messageId, sentAt, channel, timestamp, context, anonymousId, userId, integrations);
   }
 
   /** Returns the {@link Message.Type} of the message this builder is constructing. */

diff --git a/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/PageMessage.java b/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/PageMessage.java
@@ -94,6 +94,7 @@ protected PageMessage realBuild(
         Type type,
         String messageId,
         Date sentAt,
+        String channel,
         Date timestamp,
         Map<String, ?> context,
         String anonymousId,
@@ -103,6 +104,7 @@ protected PageMessage realBuild(
           type,
           messageId,
           sentAt,
+          channel,
           timestamp,
           context,
           anonymousId,

diff --git a/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/ScreenMessage.java b/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/ScreenMessage.java
@@ -81,6 +81,7 @@ protected ScreenMessage realBuild(
         Type type,
         String messageId,
         Date sentAt,
+        String channel,
         Date timestamp,
         Map<String, ?> context,
         String anonymousId,
@@ -90,6 +91,7 @@ protected ScreenMessage realBuild(
           type,
           messageId,
           sentAt,
+          channel,
           timestamp,
           context,
           anonymousId,

diff --git a/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/TrackMessage.java b/analytics-core/src/main/java/com/rudderstack/sdk/java/analytics/messages/TrackMessage.java
@@ -81,6 +81,7 @@ protected TrackMessage realBuild(
         Type type,
         String messageId,
         Date sentAt,
+        String channel,
         Date timestamp,
         Map<String, ?> context,
         String anonymousId,
@@ -90,6 +91,7 @@ protected TrackMessage realBuild(
           type,
           messageId,
           sentAt,
+          channel,
           timestamp,
           context,
           anonymousId,

diff --git a/analytics/src/main/java/com/rudderstack/sdk/java/analytics/internal/FlushMessage.java b/analytics/src/main/java/com/rudderstack/sdk/java/analytics/internal/FlushMessage.java
@@ -29,6 +29,12 @@ public Date sentAt() {
         throw new UnsupportedOperationException();
     }
 
+    @Nonnull
+    @Override
+    public String channel() {
+        throw new UnsupportedOperationException();
+    }
+
     @Nonnull
     @Override
     public Date timestamp() {

diff --git a/analytics/src/main/java/com/rudderstack/sdk/java/analytics/internal/StopMessage.java b/analytics/src/main/java/com/rudderstack/sdk/java/analytics/internal/StopMessage.java
@@ -29,6 +29,12 @@ public Date sentAt() {
         throw new UnsupportedOperationException();
     }
 
+    @Nonnull
+    @Override
+    public String channel() {
+        throw new UnsupportedOperationException();
+    }
+
     @Nonnull
     @Override
     public Date timestamp() {