Add segment tracking to public api endpoints (#5960)

airbytehq · Apr 18, 2023 · 32fa531 · 32fa531
1 parent 9365c19
commit 32fa531
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/airbyte-analytics/src/main/java/io/airbyte/analytics/LoggingTrackingClient.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/LoggingTrackingClient.java
@@ -15,7 +15,7 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Tracking client that logs to STDOUT. Mainly used for local deveolpment.
+ * Tracking client that logs to STDOUT. Mainly used for local development.
  */
 public class LoggingTrackingClient implements TrackingClient {
 
@@ -44,11 +44,13 @@ public void track(@Nullable final UUID workspaceId, final String action) {
 
   @Override
   public void track(@Nullable final UUID workspaceId, final String action, final Map<String, Object> metadata) {
+    TrackingIdentity trackingIdentity = identityFetcher.apply(workspaceId);
+
     String version = null;
     UUID userId = null;
-    if (workspaceId != null) {
-      version = Optional.ofNullable(identityFetcher.apply(workspaceId).getAirbyteVersion()).map(AirbyteVersion::serialize).orElse(null);
-      userId = identityFetcher.apply(workspaceId).getCustomerId();
+    if (identityFetcher.apply(workspaceId) != null) {
+      version = Optional.ofNullable(trackingIdentity.getAirbyteVersion()).map(AirbyteVersion::serialize).orElse(null);
+      userId = trackingIdentity.getCustomerId();
     }
     LOGGER.info("track. version: {}, userId: {}, action: {}, metadata: {}",
         version,

diff --git a/airbyte-analytics/src/main/java/io/airbyte/analytics/SegmentTrackingClient.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/SegmentTrackingClient.java
@@ -76,7 +76,6 @@ public class SegmentTrackingClient implements TrackingClient {
 
   public SegmentTrackingClient(final Function<UUID, TrackingIdentity> identityFetcher,
                                final Deployment deployment,
-
                                final String airbyteRole) {
     this(identityFetcher, deployment, airbyteRole, Analytics.builder(SEGMENT_WRITE_KEY).build());
   }
@@ -127,6 +126,7 @@ public void track(@Nullable final UUID workspaceId, final String action, final M
       LOGGER.error("Could not track action {} due to null workspaceId", action);
       return;
     }
+
     final Map<String, Object> mapCopy = new HashMap<>(metadata);
     final TrackingIdentity trackingIdentity = identityFetcher.apply(workspaceId);
 

diff --git a/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java
@@ -76,6 +76,25 @@ private static void initialize() {
     initialize(new LoggingTrackingClient(workspaceId -> TrackingIdentity.empty()));
   }
 
+  /**
+   * Initialize client for Airbyte API usage.
+   */
+  public static void initializeWithoutDatabase(final Configs.TrackingStrategy trackingStrategy,
+                                               final Deployment deployment,
+                                               final AirbyteVersion airbyteVersion) {
+    initialize(createTrackingClient(
+        trackingStrategy,
+        deployment,
+        null,
+        (userId) -> new TrackingIdentity(
+            airbyteVersion,
+            userId,
+            null,
+            null,
+            null,
+            null)));
+  }
+
   @VisibleForTesting
   static TrackingIdentity getTrackingIdentity(final ConfigRepository configRepository, final AirbyteVersion airbyteVersion, final UUID workspaceId) {
     try {

diff --git a/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingIdentity.java b/airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingIdentity.java
@@ -26,8 +26,7 @@ public static TrackingIdentity empty() {
     return new TrackingIdentity(null, null, null, null, null, null);
   }
 
-  public TrackingIdentity(
-                          final AirbyteVersion airbyteVersion,
+  public TrackingIdentity(final AirbyteVersion airbyteVersion,
                           final UUID customerId,
                           final String email,
                           final Boolean anonymousDataCollection,