feat: Telemetry ID improvement

spotify · Jun 3, 2024 · 0efcf54 · 0efcf54
1 parent 42cec7f
commit 0efcf54
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/main/java/com/spotify/confidence/Confidence.java b/src/main/java/com/spotify/confidence/Confidence.java
@@ -320,10 +320,18 @@ public Builder flagResolverManagedChannel(ManagedChannel managedChannel) {
       return this;
     }
 
+    Confidence buildForProvider() {
+      return build(true);
+    }
+
     public Confidence build() {
+      return build(false);
+    }
+
+    private Confidence build(Boolean isProvider) {
       final FlagResolverClient flagResolverClient =
           new FlagResolverClientImpl(
-              new GrpcFlagResolver(clientSecret, flagResolverManagedChannel));
+              new GrpcFlagResolver(clientSecret, flagResolverManagedChannel, isProvider));
       final EventSenderEngine eventSenderEngine =
           new EventSenderEngineImpl(clientSecret, DEFAULT_CHANNEL, Instant::now);
       closer.register(flagResolverClient);

diff --git a/src/main/java/com/spotify/confidence/ConfidenceFeatureProvider.java b/src/main/java/com/spotify/confidence/ConfidenceFeatureProvider.java
@@ -53,7 +53,10 @@ public ConfidenceFeatureProvider(Confidence confidence) {
    */
   @Deprecated()
   public ConfidenceFeatureProvider(String clientSecret, ManagedChannel managedChannel) {
-    this(Confidence.builder(clientSecret).flagResolverManagedChannel(managedChannel).build());
+    this(
+        Confidence.builder(clientSecret)
+            .flagResolverManagedChannel(managedChannel)
+            .buildForProvider());
   }
 
   /**

diff --git a/src/main/java/com/spotify/confidence/GrpcFlagResolver.java b/src/main/java/com/spotify/confidence/GrpcFlagResolver.java
@@ -15,14 +15,14 @@ public class GrpcFlagResolver implements FlagResolver {
 
   private final FlagResolverServiceGrpc.FlagResolverServiceFutureStub stub;
 
-  public GrpcFlagResolver(String clientSecret, ManagedChannel managedChannel) {
+  public GrpcFlagResolver(String clientSecret, ManagedChannel managedChannel, Boolean isProvider) {
     if (Strings.isNullOrEmpty(clientSecret)) {
       throw new IllegalArgumentException("clientSecret must be a non-empty string.");
     }
     this.clientSecret = clientSecret;
     this.sdk =
         Sdk.newBuilder()
-            .setId(SdkId.SDK_ID_JAVA_PROVIDER)
+            .setId(isProvider ? SdkId.SDK_ID_JAVA_PROVIDER : SdkId.SDK_ID_JAVA_CONFIDENCE)
             .setVersion(ConfidenceUtils.getSdkVersion())
             .build();
     this.managedChannel = managedChannel;

diff --git a/src/test/java/com/spotify/confidence/FeatureProviderTest.java b/src/test/java/com/spotify/confidence/FeatureProviderTest.java
@@ -70,7 +70,7 @@ void beforeEach() {
     final FakeEventSenderEngine fakeEventSender = new FakeEventSenderEngine(new FakeClock());
     channel = InProcessChannelBuilder.forName(serverName).directExecutor().build();
     final FlagResolverClientImpl flagResolver =
-        new FlagResolverClientImpl(new GrpcFlagResolver("fake-secret", channel));
+        new FlagResolverClientImpl(new GrpcFlagResolver("fake-secret", channel, false));
     final Confidence confidence = Confidence.create(fakeEventSender, flagResolver);
     final FeatureProvider featureProvider = new ConfidenceFeatureProvider(confidence);