Skip to content

AddMoreLogsInKafkaConnector #46224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xinlian12 merged 7 commits into from
Jul 31, 2025
Merged

AddMoreLogsInKafkaConnector #46224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5f190c
add more logs in kafka connector
Jul 30, 2025
2676f83
add extra logs for kafka connector
Jul 30, 2025
85f2452
resolve comments
Jul 30, 2025
10f416c
try to fix readme
Jul 30, 2025
89db87a
update changelog
Jul 30, 2025
1a2af9d
fix more readme
Jul 30, 2025
0d3a45a
Merge branch 'main' into addMoreLogsInKafkaConnector
Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sdk/cosmos/azure-cosmos-kafka-connect/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#### Bugs Fixed

#### Other Changes
* Added more logs in `CosmosSourceTask` and `CosmosSinkTask` - See [PR 46224](https://github.com/Azure/azure-sdk-for-java/pull/46224)

### 2.4.0 (2025-06-24)

Expand Down
69 changes: 43 additions & 26 deletions ...nect/src/main/java/com/azure/cosmos/kafka/connect/implementation/sink/CosmosSinkTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,36 @@ public String version() {
@Override
public void start(Map<String, String> props) {
LOGGER.info("Starting the kafka cosmos sink task");
this.sinkTaskConfig = new CosmosSinkTaskConfig(props);
this.cosmosClientItem =
CosmosClientCache.getCosmosClient(
this.sinkTaskConfig.getAccountConfig(),
this.sinkTaskConfig.getTaskId(),
this.sinkTaskConfig.getClientMetadataCachesSnapshot());
LOGGER.info("The taskId is " + this.sinkTaskConfig.getTaskId());
this.throughputControlClientItem = this.getThroughputControlCosmosClient();
this.sinkRecordTransformer = new SinkRecordTransformer(this.sinkTaskConfig);

if (this.sinkTaskConfig.getWriteConfig().isBulkEnabled()) {
this.cosmosWriter =
new CosmosBulkWriter(
this.sinkTaskConfig.getWriteConfig(),
this.sinkTaskConfig.getThroughputControlConfig(),
this.context.errantRecordReporter());
} else {
this.cosmosWriter =
new CosmosPointWriter(
this.sinkTaskConfig.getWriteConfig(),
this.sinkTaskConfig.getThroughputControlConfig(),
context.errantRecordReporter());

try {
this.sinkTaskConfig = new CosmosSinkTaskConfig(props);
this.cosmosClientItem =
CosmosClientCache.getCosmosClient(
this.sinkTaskConfig.getAccountConfig(),
this.sinkTaskConfig.getTaskId(),
this.sinkTaskConfig.getClientMetadataCachesSnapshot());
LOGGER.info("The taskId is " + this.sinkTaskConfig.getTaskId());
this.throughputControlClientItem = this.getThroughputControlCosmosClient();
this.sinkRecordTransformer = new SinkRecordTransformer(this.sinkTaskConfig);

if (this.sinkTaskConfig.getWriteConfig().isBulkEnabled()) {
this.cosmosWriter =
new CosmosBulkWriter(
this.sinkTaskConfig.getWriteConfig(),
this.sinkTaskConfig.getThroughputControlConfig(),
this.context.errantRecordReporter());
} else {
this.cosmosWriter =
new CosmosPointWriter(
this.sinkTaskConfig.getWriteConfig(),
this.sinkTaskConfig.getThroughputControlConfig(),
context.errantRecordReporter());
}
} catch (Throwable e) {
LOGGER.warn("Error occurred while starting the kafka sink task", e);
Comment thread
xinlian12 marked this conversation as resolved.
this.cleanup();

throw e;
}
}

Expand All @@ -80,7 +88,7 @@ public void put(Collection<SinkRecord> records) {
return;
}

LOGGER.debug("Sending {} records to be written", records.size());
LOGGER.info("Sending {} records to be written", records.size());

// group by container
Map<String, List<SinkRecord>> recordsByContainer =
Expand Down Expand Up @@ -115,17 +123,26 @@ record -> this.sinkTaskConfig
}
}

@Override
public void stop() {
LOGGER.info("Stopping Kafka CosmosDB sink task");

private void cleanup() {
LOGGER.info("Cleaning up CosmosSinkTask");

if (this.throughputControlClientItem != null && this.throughputControlClientItem != this.cosmosClientItem) {
LOGGER.debug("Releasing throughput control cosmos client");
CosmosClientCache.releaseCosmosClient(this.throughputControlClientItem.getClientConfig());
this.throughputControlClientItem = null;
}

if (this.cosmosClientItem != null) {
LOGGER.debug("Releasing cosmos client");
CosmosClientCache.releaseCosmosClient(this.cosmosClientItem.getClientConfig());
this.cosmosClientItem = null;
}
}

@Override
public void stop() {
LOGGER.info("Stopping Kafka CosmosDB sink task");
this.cleanup();
}
}
60 changes: 43 additions & 17 deletions .../src/main/java/com/azure/cosmos/kafka/connect/implementation/source/CosmosSourceTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,36 @@ public String version() {
public void start(Map<String, String> map) {
LOGGER.info("Starting the kafka cosmos source task...");

this.taskConfig = new CosmosSourceTaskConfig(map);
if (this.taskConfig.getMetadataTaskUnit() != null) {
// adding metadata task units into the head of the queue
this.taskUnitsQueue.add(this.taskConfig.getMetadataTaskUnit());
}

this.taskUnitsQueue.addAll(this.taskConfig.getFeedRangeTaskUnits());
LOGGER.info("Creating the cosmos client");
try {
LOGGER.info("Resetting task queue");
this.taskUnitsQueue.clear();

this.taskConfig = new CosmosSourceTaskConfig(map);
if (this.taskConfig.getMetadataTaskUnit() != null) {
// adding metadata task units into the head of the queue
LOGGER.info("Adding metadata task to task {}", this.taskConfig.getTaskId());
this.taskUnitsQueue.add(this.taskConfig.getMetadataTaskUnit());
}

this.cosmosClientItem =
CosmosClientCache.getCosmosClient(
this.taskConfig.getAccountConfig(),
this.taskConfig.getTaskId(),
this.taskConfig.getCosmosClientMetadataCachesSnapshot());
this.throughputControlCosmosClientItem = this.getThroughputControlCosmosClientItem();
LOGGER.info(
"Adding {} feed range tasks to task {}",
this.taskConfig.getFeedRangeTaskUnits().size(),
this.taskConfig.getTaskId());

this.taskUnitsQueue.addAll(this.taskConfig.getFeedRangeTaskUnits());
LOGGER.info("Creating the cosmos client");

this.cosmosClientItem =
CosmosClientCache.getCosmosClient(
this.taskConfig.getAccountConfig(),
this.taskConfig.getTaskId(),
this.taskConfig.getCosmosClientMetadataCachesSnapshot());
this.throughputControlCosmosClientItem = this.getThroughputControlCosmosClientItem();
} catch (Throwable ex) {
LOGGER.warn("Failed to start the cosmos source task", ex);
this.cleanup();
throw ex;
}
}

private CosmosClientCacheItem getThroughputControlCosmosClientItem() {
Expand Down Expand Up @@ -113,7 +128,7 @@ public List<SourceRecord> poll() {
}

stopwatch.stop();
LOGGER.debug(
LOGGER.info(
Comment thread
xinlian12 marked this conversation as resolved.
"Return {} records, databaseName {}, containerName {}, containerRid {}, feedRange {}, durationInMs {}",
results.size(),
((FeedRangeTaskUnit) taskUnit).getDatabaseName(),
Expand All @@ -127,6 +142,8 @@ public List<SourceRecord> poll() {
} catch (Exception e) {
// for error cases, we should always put the task back to the queue
this.taskUnitsQueue.add(taskUnit);
LOGGER.warn("Polling task failed", e);

throw KafkaCosmosExceptionsHelper.convertToConnectException(e, "PollTask failed");
}
}
Expand Down Expand Up @@ -390,16 +407,25 @@ private CosmosChangeFeedRequestOptions getChangeFeedRequestOptions(FeedRangeTask
return changeFeedRequestOptions;
}

@Override
public void stop() {
private void cleanup() {
LOGGER.info("Cleaning up CosmosSourceTask");

if (this.throughputControlCosmosClientItem != null && this.throughputControlCosmosClientItem != this.cosmosClientItem) {
LOGGER.debug("Releasing throughput control cosmos client");
CosmosClientCache.releaseCosmosClient(this.throughputControlCosmosClientItem.getClientConfig());
this.throughputControlCosmosClientItem = null;
}

if (this.cosmosClientItem != null) {
LOGGER.debug("Releasing cosmos client");
CosmosClientCache.releaseCosmosClient(this.cosmosClientItem.getClientConfig());
this.cosmosClientItem = null;
}
}

@Override
public void stop() {
LOGGER.info("Stopping CosmosSourceTask");
this.cleanup();
}
}
Loading