OZG-4390 add interceptor to stubs

api-lib-core/src/main/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandService.java

@@ -2,6 +2,8 @@ package de.ozgcloud.apilib.common.command.grpc;
 
 import de.itvsh.ozg.pluto.grpc.command.CommandServiceGrpc.CommandServiceBlockingStub;
 import de.itvsh.ozg.pluto.grpc.command.GrpcGetCommandRequest;
+import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
+import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.common.command.OzgCloudCommand;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandId;
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
@@ -18,13 +20,15 @@ public class GrpcOzgCloudCommandService implements OzgCloudCommandService {
 
 	private final CommandMapper mapper;
 
+	private final OzgCloudCallContextProvider contextProvider;
+
 	@Override
 	public OzgCloudCommand createAndWaitUntilDone(OzgCloudCommand commandToCreate) {
 		return waitUntilDone(create(commandToCreate));
 	}
 
 	OzgCloudCommand create(OzgCloudCommand commandToCreate) {
-		var created = commandServiceStub.createCommand(mapper.buildCreateCommandRequest(commandToCreate));
+		var created = getCommandServiceStub().createCommand(mapper.buildCreateCommandRequest(commandToCreate));
 		return mapper.fromGrpc(created.getCommand());
 	}
 
@@ -46,6 +50,10 @@ public class GrpcOzgCloudCommandService implements OzgCloudCommandService {
 
 	private OzgCloudCommand reloadCommand(OzgCloudCommandId commandId) {
 		GrpcGetCommandRequest request = GrpcGetCommandRequest.newBuilder().setId(commandId.toString()).build();
-		return mapper.fromGrpc(commandServiceStub.getCommand(request));
+		return mapper.fromGrpc(getCommandServiceStub().getCommand(request));
+	}
+
+	CommandServiceBlockingStub getCommandServiceStub() {
+		return commandServiceStub.withInterceptors(new OzgCloudCallContextAttachingInterceptor(contextProvider));
 	}
 }

api-lib-core/src/main/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileService.java

@@ -18,6 +18,8 @@ import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcBinaryFilesRequest;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcFindFilesResponse;
 import de.itvsh.ozg.pluto.grpc.binaryFile.GrpcGetBinaryFileDataRequest;
 import de.itvsh.ozg.pluto.grpc.file.GrpcOzgFile;
+import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextAttachingInterceptor;
+import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
 import de.ozgcloud.apilib.common.errorhandling.NotFoundException;
 import de.ozgcloud.apilib.file.OzgCloudFile;
 import de.ozgcloud.apilib.file.OzgCloudFileId;
@@ -37,13 +39,15 @@ public class GrpcOzgCloudFileService implements OzgCloudFileService {
 	@GrpcClient("file-manager")
 	private final BinaryFileServiceStub asyncServiceStub;
 
+	private final OzgCloudCallContextProvider contextProvider;
+
 	private final OzgCloudFileMapper mapper;
 
 	static final int CHUNK_SIZE = 255 * 1024;
 
 	@Override
 	public OzgCloudFile getFile(OzgCloudFileId id) {
-		var response = blockingStub.findBinaryFilesMetaData(buildFindFileRequest(id));
+		var response = getBlockingStub().findBinaryFilesMetaData(buildFindFileRequest(id));
 
 		return mapper.fromGrpc(getSingleResponse(response, id));
 	}
@@ -71,7 +75,7 @@ public class GrpcOzgCloudFileService implements OzgCloudFileService {
 		var streamFuture = new CompletableFuture<Boolean>();
 		var responseObserver = new OzgCloudFileDownloadStreamObserver(streamFuture, streamToWriteData);
 
-		asyncServiceStub.getBinaryFileContent(buildGrpcGetBinaryFileDataRequest(fileId), responseObserver);
+		getAsyncServiceStub().getBinaryFileContent(buildGrpcGetBinaryFileDataRequest(fileId), responseObserver);
 
 		waitUntilFutureToComplete(streamFuture);
 	}
@@ -90,4 +94,12 @@ public class GrpcOzgCloudFileService implements OzgCloudFileService {
 			throw new TechnicalException(e.getMessage(), e);
 		}
 	}
+
+	BinaryFileServiceBlockingStub getBlockingStub() {
+		return blockingStub.withInterceptors(new OzgCloudCallContextAttachingInterceptor(contextProvider));
+	}
+
+	BinaryFileServiceStub getAsyncServiceStub() {
+		return asyncServiceStub.withInterceptors(new OzgCloudCallContextAttachingInterceptor(contextProvider));
+	}
 }

api-lib-core/src/test/java/de/ozgcloud/apilib/common/command/grpc/GrpcOzgCloudCommandServiceTest.java

@@ -54,6 +54,7 @@ class GrpcOzgCloudCommandServiceTest {
 
 			@BeforeEach
 			void init() {
+				when(serviceStub.withInterceptors(any())).thenReturn(serviceStub);
 				when(serviceStub.createCommand(any())).thenReturn(GrpcCommandResponseTestFactory.create());
 			}
 

api-lib-core/src/test/java/de/ozgcloud/apilib/file/grpc/GrpcOzgCloudFileServiceTest.java

@@ -34,6 +34,7 @@ class GrpcOzgCloudFileServiceTest {
 		class CallGetFile {
 			@BeforeEach
 			void init() {
+				when(blockingStub.withInterceptors(any())).thenReturn(blockingStub);
 				when(blockingStub.findBinaryFilesMetaData(any())).thenReturn(GrpcFindFilesResponse.newBuilder().addFile(GrpcOzgFileTestFactory.create()).build());
 			}
 

ozg-cloud-spring-boot-starter/src/main/java/de/ozgcloud/client/autoconfigure/OzgCloudClientAutoConfiguration.java

@@ -104,8 +104,8 @@ public class OzgCloudClientAutoConfiguration {
 	@Bean
 	@ConditionalOnProperty("ozgcloud.command-manager.address")
 	OzgCloudCommandService grpcCommandService(@GrpcClient("command-manager") CommandServiceBlockingStub commandServiceStub,
-		CommandMapper commandMapper) {
-		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper);
+		CommandMapper commandMapper,  OzgCloudCallContextProvider contextProvider) {
+		return new GrpcOzgCloudCommandService(commandServiceStub, commandMapper, contextProvider);
 	}
 
 	@Bean