fix: fix logger (#208)

fix logger

Author: vahidlazio

confidence-proto/src/main/proto/confidence/flags/admin/v1/internal_api.proto

@@ -6,17 +6,21 @@ import "google/api/resource.proto";
 import "google/protobuf/struct.proto";
 import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
+
 import "confidence/flags/resolver/v1/types.proto";
 import "confidence/flags/resolver/v1/events/events.proto";
 
-option java_package = "com.spotify.confidence.shaded.flags.resolver.v1";
+option java_package = "com.spotify.confidence.flags.resolver.v1";
 option java_multiple_files = true;
 option java_outer_classname = "InternalApiProto";
 
 // The service that allows to report flag assigned and other client-side flag
 // operations, useful when the resolve engine runs on the customer's premises
 // (e.g. side-car)
-service FlagLoggerService {
+service InternalFlagLoggerService {
+  // Writes flag assignment events. Mostly called from the sidecar resolver.
+  // (-- api-linter: core::0136::http-uri-suffix=disabled
+  //     aip.dev/not-precedent: Disabled because the additional binding. --)
   rpc WriteFlagAssigned(WriteFlagAssignedRequest) returns (WriteFlagAssignedResponse){
     option (google.api.http) = {
       post: "/v1/flagAssigned:write"

openfeature-provider-local/src/main/java/com/spotify/confidence/AssignLogger.java

@@ -7,11 +7,11 @@
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
-import com.spotify.confidence.shaded.flags.resolver.v1.FlagLoggerServiceGrpc;
+import com.spotify.confidence.flags.resolver.v1.InternalFlagLoggerServiceGrpc;
+import com.spotify.confidence.flags.resolver.v1.TelemetryData;
+import com.spotify.confidence.flags.resolver.v1.WriteFlagAssignedRequest;
+import com.spotify.confidence.flags.resolver.v1.WriteFlagAssignedResponse;
 import com.spotify.confidence.shaded.flags.resolver.v1.Sdk;
-import com.spotify.confidence.shaded.flags.resolver.v1.TelemetryData;
-import com.spotify.confidence.shaded.flags.resolver.v1.WriteFlagAssignedRequest;
-import com.spotify.confidence.shaded.flags.resolver.v1.WriteFlagAssignedResponse;
 import com.spotify.confidence.shaded.flags.resolver.v1.events.FlagAssigned;
 import java.io.Closeable;
 import java.time.Duration;
@@ -39,12 +39,12 @@ class AssignLogger implements Closeable {
   private Instant lastFlagAssigned = Instant.now();
   private final Timer timer;
 
-  private final FlagLoggerServiceGrpc.FlagLoggerServiceBlockingStub flagLoggerStub;
+  private final InternalFlagLoggerServiceGrpc.InternalFlagLoggerServiceBlockingStub flagLoggerStub;
   private final Meter assigned;
 
   @VisibleForTesting
   AssignLogger(
-      FlagLoggerServiceGrpc.FlagLoggerServiceBlockingStub flagLoggerStub,
+      InternalFlagLoggerServiceGrpc.InternalFlagLoggerServiceBlockingStub flagLoggerStub,
       Timer timer,
       MetricRegistry metricRegistry,
       long capacity) {
@@ -64,7 +64,7 @@ private Long timeSinceLastAssigned() {
   }
 
   static AssignLogger createStarted(
-      FlagLoggerServiceGrpc.FlagLoggerServiceBlockingStub flagLoggerStub,
+      InternalFlagLoggerServiceGrpc.InternalFlagLoggerServiceBlockingStub flagLoggerStub,
       Duration checkpointInterval,
       MetricRegistry metricRegistry,
       long capacity) {

openfeature-provider-local/src/main/java/com/spotify/confidence/FlagToApply.java

@@ -1,6 +1,6 @@
 package com.spotify.confidence;
 
-import com.spotify.confidence.shaded.flags.resolver.v1.ResolveTokenV1;
+import com.spotify.confidence.flags.resolver.v1.ResolveTokenV1;
 import java.time.Instant;
 
 record FlagToApply(Instant skewAdjustedAppliedTime, ResolveTokenV1.AssignedFlag assignment) {}

openfeature-provider-local/src/main/java/com/spotify/confidence/LocalResolverServiceFactory.java

@@ -4,8 +4,8 @@
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.protobuf.Struct;
 import com.spotify.confidence.flags.admin.v1.FlagAdminServiceGrpc;
+import com.spotify.confidence.flags.resolver.v1.InternalFlagLoggerServiceGrpc;
 import com.spotify.confidence.flags.shaded.admin.v1.ResolverStateServiceGrpc;
-import com.spotify.confidence.shaded.flags.resolver.v1.FlagLoggerServiceGrpc;
 import com.spotify.confidence.shaded.flags.resolver.v1.Sdk;
 import com.spotify.confidence.shaded.iam.v1.AuthServiceGrpc;
 import com.spotify.confidence.shaded.iam.v1.ClientCredential;
@@ -64,7 +64,7 @@ static FlagResolverService from(ApiSecret apiSecret, String clientSecret) {
     final TokenHolder.Token token = tokenHolder.getToken();
     final Channel authenticatedChannel =
         ClientInterceptors.intercept(channel, new JwtAuthClientInterceptor(tokenHolder));
-    final var flagLoggerStub = FlagLoggerServiceGrpc.newBlockingStub(authenticatedChannel);
+    final var flagLoggerStub = InternalFlagLoggerServiceGrpc.newBlockingStub(authenticatedChannel);
     final long assignLogCapacity =
         Optional.ofNullable(System.getenv("CONFIDENCE_ASSIGN_LOG_CAPACITY"))
             .map(Long::parseLong)

openfeature-provider-local/src/main/java/com/spotify/confidence/PlainResolveTokenConverter.java

@@ -2,7 +2,7 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.spotify.confidence.shaded.flags.resolver.v1.ResolveToken;
+import com.spotify.confidence.flags.resolver.v1.ResolveToken;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

openfeature-provider-local/src/main/java/com/spotify/confidence/ResolveTokenConverter.java

@@ -2,9 +2,9 @@
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Struct;
-import com.spotify.confidence.shaded.flags.resolver.v1.ResolveToken;
-import com.spotify.confidence.shaded.flags.resolver.v1.ResolveTokenV1;
-import com.spotify.confidence.shaded.flags.resolver.v1.ResolveTokenV1.AssignedFlag;
+import com.spotify.confidence.flags.resolver.v1.ResolveToken;
+import com.spotify.confidence.flags.resolver.v1.ResolveTokenV1;
+import com.spotify.confidence.flags.resolver.v1.ResolveTokenV1.AssignedFlag;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;

openfeature-provider-local/src/test/java/com/spotify/confidence/AssignLoggerTest.java

@@ -11,11 +11,11 @@
 import static org.mockito.Mockito.when;
 
 import com.codahale.metrics.MetricRegistry;
-import com.spotify.confidence.shaded.flags.resolver.v1.FlagLoggerServiceGrpc;
-import com.spotify.confidence.shaded.flags.resolver.v1.ResolveTokenV1;
+import com.spotify.confidence.flags.resolver.v1.InternalFlagLoggerServiceGrpc;
+import com.spotify.confidence.flags.resolver.v1.ResolveTokenV1;
+import com.spotify.confidence.flags.resolver.v1.WriteFlagAssignedRequest;
+import com.spotify.confidence.flags.resolver.v1.WriteFlagAssignedResponse;
 import com.spotify.confidence.shaded.flags.resolver.v1.Sdk;
-import com.spotify.confidence.shaded.flags.resolver.v1.WriteFlagAssignedRequest;
-import com.spotify.confidence.shaded.flags.resolver.v1.WriteFlagAssignedResponse;
 import com.spotify.confidence.shaded.flags.resolver.v1.events.FlagAssigned;
 import com.spotify.confidence.shaded.iam.v1.Client;
 import com.spotify.confidence.shaded.iam.v1.ClientCredential;
@@ -30,13 +30,13 @@
 import org.mockito.Mockito;
 
 public class AssignLoggerTest {
-  private FlagLoggerServiceGrpc.FlagLoggerServiceBlockingStub stub;
+  private InternalFlagLoggerServiceGrpc.InternalFlagLoggerServiceBlockingStub stub;
   private AssignLogger logger;
 
   @BeforeEach
   public void beforeEach() {
 
-    stub = mock(FlagLoggerServiceGrpc.FlagLoggerServiceBlockingStub.class);
+    stub = mock(InternalFlagLoggerServiceGrpc.InternalFlagLoggerServiceBlockingStub.class);
     logger = new AssignLogger(stub, null, new MetricRegistry(), 8 * 1024 * 1024);
   }