Skip to content

Several small fixes #3763

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

Open
sophokles73 wants to merge 4 commits into
base: 2.7.x
Choose a base branch
from
Open

Several small fixes #3763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74a7ce1
Remove trailing whitespace
sophokles73 Jul 20, 2026
4e2db4f
Remove obsolete classpath entries from container image Java configura…
sophokles73 Jul 20, 2026
7da9d2e
Use Apache Kafka 4.3 image for integration tests
sophokles73 Jul 22, 2026
c9b50f0
Increase command router log level for integration tests.
sophokles73 Jul 20, 2026
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
6 changes: 3 additions & 3 deletions adapters/parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<description>Defines common dependencies and build profiles for Quarkus-based protocol adapter implementations</description>

<properties>
<!--
<!--
hono.authType poperty is needed while quarkus resolve dev properties (it
contains hono.authType=${hono.authType}). That's why we specify here.
For services it is delegating. For adapters, hono auth is disabled
For services it is delegating. For adapters, hono auth is disabled
-->
<hono.authType>n/a</hono.authType>

Expand Down Expand Up @@ -148,7 +148,7 @@ hono.kafka.commandResponse.producerConfig."request.timeout.ms"=${kafka-client.pr
<JAVA_MAJOR_VERSION>${maven.compiler.release}</JAVA_MAJOR_VERSION>
<JAVA_APP_NAME>${project.artifactId}</JAVA_APP_NAME>
<JAVA_MAIN_CLASS>io.quarkus.bootstrap.runner.QuarkusEntryPoint</JAVA_MAIN_CLASS>
<JAVA_LIB_DIR>app/*:quarkus/*:lib/boot/*:lib/main/*:extensions/*</JAVA_LIB_DIR>
<JAVA_LIB_DIR>extensions/*</JAVA_LIB_DIR>
<!--
- make sure that the size of (ephemeral) keys used for Diffie-Hellman exchanges
match the length of the (private) key used for the service's identity
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<java-base-image.name>docker.io/library/eclipse-temurin:21-jre-ubi9-minimal</java-base-image.name>
<jjwt.version>0.13.0</jjwt.version>
<kafka-clients.version>3.9.2</kafka-clients.version>
<kafka-image.name>docker.io/confluentinc/cp-kafka:7.9.5</kafka-image.name>
<kafka-image.name>docker.io/apache/kafka:4.3.1</kafka-image.name>
<logback.version>1.5.34</logback.version>
<mongodb-image.name>docker.io/library/mongo:7.0</mongodb-image.name>
<native.image.name>quay.io/quarkus/ubi9-quarkus-micro-image:2.0</native.image.name>
Expand Down
4 changes: 2 additions & 2 deletions .../kafka-common/src/main/java/org/eclipse/hono/client/kafka/consumer/HonoKafkaConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,8 +766,8 @@ public void onPartitionsAssigned(final Collection<org.apache.kafka.common.TopicP
// invoked on the Kafka polling thread, not the event loop thread!
final Set<TopicPartition> partitionsSet = Helper.from(partitions);
if (LOG.isDebugEnabled()) {
LOG.debug("partitions assigned: [{}] [client-id: {}]",
HonoKafkaConsumerHelper.getPartitionsDebugString(partitions), getClientId());
LOG.debug("partitions assigned [client-id: {}]: [{}]",
getClientId(), HonoKafkaConsumerHelper.getPartitionsDebugString(partitions));
}
ensurePositionsHaveBeenSetIfNeeded(partitionsSet);
updateSubscribedTopicPatternTopicsAndRemoveMetrics();
Expand Down
6 changes: 5 additions & 1 deletion .../java/org/eclipse/hono/commandrouter/impl/kafka/KafkaBasedCommandConsumerFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@ private void registerTenantCreationListener() {
// Doing it here will speed up the first invocation of "createCommandConsumer" for this tenant.
final String tenantId = notification.getTenantId();
final String topic = new HonoTopic(HonoTopic.Type.COMMAND, tenantId).toString();
LOG.info("""
received notification about newly created tenant [id: {}], \
ensuring corresponding command topic [{}] is among subscribed topics...""",
tenantId, topic);
kafkaConsumer.ensureTopicIsAmongSubscribedTopicPatternTopics(topic);
}
});
Expand All @@ -280,7 +284,7 @@ public Future<Void> createCommandConsumer(final String tenantId, final SpanConte
LOG.debug("createCommandConsumer: topic is already subscribed [{}]", topic);
return Future.succeededFuture();
}
LOG.debug("""
LOG.info("""
createCommandConsumer: topic not subscribed; check for its existence, triggering auto-creation \
if enabled [{}]\
""", topic);
Expand Down
2 changes: 1 addition & 1 deletion ...ngodb/src/test/java/org/eclipse/hono/deviceregistry/mongodb/service/MongoDbTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
public final class MongoDbTestUtils {

private static final MongoDBContainer MONGO_DB_CONTAINER;
private static final String MONGO_DB_IMAGE_NAME = System.getProperty("mongoDbImageName", "mongo:6.0");
private static final String MONGO_DB_IMAGE_NAME = System.getProperty("mongoDbImageName", "mongo:7.0");
private static final Logger LOG = LoggerFactory.getLogger(MongoDbTestUtils.class);

static {
Expand Down
2 changes: 1 addition & 1 deletion services/parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
<JAVA_MAJOR_VERSION>${maven.compiler.release}</JAVA_MAJOR_VERSION>
<JAVA_APP_NAME>${project.artifactId}</JAVA_APP_NAME>
<JAVA_MAIN_CLASS>io.quarkus.bootstrap.runner.QuarkusEntryPoint</JAVA_MAIN_CLASS>
<JAVA_LIB_DIR>app/*:quarkus/*:lib/boot/*:lib/main/*:extensions/*</JAVA_LIB_DIR>
<JAVA_LIB_DIR>extensions/*</JAVA_LIB_DIR>
<!--
- make sure that the size of (ephemeral) keys used for Diffie-Hellman exchanges
match the length of the (private) key used for the service's identity
Expand Down
4 changes: 2 additions & 2 deletions tests/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,13 @@ mvn verify -Prun-tests,jaeger -Ddocker.keepRunning -Dit.test=TelemetryHttpIT#tes
```

Note that in order to be able to view the traces after a test run, the `docker.keepRunning` property has
to be used as well, as shown above.
to be used as well, as shown above.

The Jaeger UI, showing the traces of the test run, can be accessed at `http://localhost:18080`

if the Docker engine is running on `localhost`, otherwise the appropriate Docker host has to be used in the
above URL. To choose a different port for the Jaeger UI, set the `jaeger.query.port` Maven property to the
desired port when running the tests.
desired port when running the tests.

Start subsequent test runs using the running containers with the `useRunningContainers` Maven profile, e.g.:

Expand Down
8 changes: 4 additions & 4 deletions tests/src/test/java/org/eclipse/hono/tests/http/HttpTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,11 +1124,11 @@ public void testHandleConcurrentUploadWithTtd(final VertxTestContext ctx) throws
});
switch (msg.getContentType()) {
case "text/msg1":
logger.debug("received first message");
logger.info("received first message");
firstMessageReceived.complete();
break;
case "text/msg2":
logger.debug("received second message");
logger.info("received second message");
Comment on lines +1127 to +1131

@mattkaem mattkaem Jul 22, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those indentations aren't intentional, are they?

@sophokles73 sophokles73 Jul 22, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I am trying to use the Eclipse Formatter rules from the eclipse/ folder in my VS Code workspace. The change has been made automatically by the code formatter while I made changes to these lines. It seems like the formatter only applies the rules automatically on save to the changed lines, while it leaves the rest of the code untouched. This seems to have led to the wild mixture in indentation. When I format the whole file, almost all of the indentation is consistently changed.

I am afraid that many of the files in our repo do not really comply with our code formatting rules (yet).
IMHO we should strive to comply with these rules whenever we edit a file as part of a PR but should not apply the rules to all of the code base in one go.
Another option would be to adapt the code formatting rules accordingly, but I'd rather keep them as they are ...
WDYT?

@mattkaem mattkaem Jul 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO the indentation is a bit excessive but if that is the eclipse standard then we should apply it. I think we should apply it to the whole file though. WDYT?

secondMessageReceived.complete();
break;
default:
Expand Down Expand Up @@ -1234,8 +1234,8 @@ public void testUploadMessagesWithTtdThatDoNotReplyWithCommand(final VertxTestCo
final var emptyResponseReceived = ctx.checkpoint();
final int ttdSeconds = 4;

helper.registry.addDeviceForTenant(tenantId,
new Tenant(), deviceId, PWD)
helper.registry.addDeviceForTenant(tenantId,
new Tenant(), deviceId, PWD)
.compose(ok -> createConsumer(tenantId, msg -> {
logger.trace("received message");
msg.getTimeUntilDisconnectNotification()
Expand Down
3 changes: 3 additions & 0 deletions tests/src/test/resources/commandrouter/logging-quarkus-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ quarkus:
level: WARN
"org.eclipse.hono":
level: INFO
# temporary debug logging for Kafka consumer in order to investigate flaky integration test
"org.eclipse.hono.client.kafka.consumer":
level: DEBUG
"org.eclipse.hono.commandrouter.impl.kafka":
level: INFO
"org.eclipse.hono.client.impl.HonoConnectionImpl":
Expand Down
Loading