Skip to content

chore: 21078: StateLogger is no longer used and can be removed #21156

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
merged 2 commits into from
Oct 2, 2025
Merged

chore: 21078: StateLogger is no longer used and can be removed #21156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
516a778
chore: 21078: StateLogger is no longer used and can be removed
artemananiev Sep 19, 2025
d9ab8c0
Sync with main
artemananiev Sep 30, 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
15 changes: 0 additions & 15 deletions .github/workflows/support/citr/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<RollingFile name="StateLogs"
fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>

</Appenders>
<Loggers>
<Root level="FATAL">
Expand Down Expand Up @@ -219,11 +209,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>

<Logger name="com.hedera" level="info" additivity="false">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
16 changes: 0 additions & 16 deletions hedera-node/configuration/compose/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<!-- State logs -->
<RollingFile name="StateLogs"
fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>

</Appenders>
<Loggers>
<Root level="FATAL">
Expand Down Expand Up @@ -218,11 +207,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>

<Logger name="com.hedera" level="info" additivity="false">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
15 changes: 0 additions & 15 deletions hedera-node/configuration/dev/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<RollingFile name="StateLogs"
fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>

</Appenders>
<Loggers>
<Root level="FATAL">
Expand Down Expand Up @@ -225,11 +215,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>

<Logger name="com.hedera" level="info" additivity="false">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
16 changes: 0 additions & 16 deletions hedera-node/configuration/mainnet/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<RollingFile name="StateLogs"
fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>

</Appenders>
<Loggers>
<Root level="FATAL">
Expand Down Expand Up @@ -225,12 +215,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>


<Logger name="com.hedera" level="info" additivity="false">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
15 changes: 0 additions & 15 deletions hedera-node/configuration/preprod/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<RollingFile name="StateLogs"
fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%d{yyyy-MM-dd--HH-mm-ss}-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>

</Appenders>
<Loggers>
<Root level="FATAL">
Expand Down Expand Up @@ -225,11 +215,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>

<Logger name="com.hedera" level="info" additivity="false">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
17 changes: 0 additions & 17 deletions hedera-node/configuration/previewnet/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<!-- State logs -->
<RollingFile name="StateLogs"
fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%d{yyyy-MM-dd--HH-mm-ss}-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>

</Appenders>
<Loggers>
<Root level="FATAL">
Expand Down Expand Up @@ -226,12 +215,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>


<Logger name="com.hedera" level="info" additivity="false">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
16 changes: 0 additions & 16 deletions hedera-node/configuration/testnet/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<!-- State logs -->
<RollingFile name="StateLogs"
fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%d{yyyy-MM-dd--HH-mm-ss}-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>

</Appenders>
<Loggers>
<Root level="FATAL">
Expand Down Expand Up @@ -226,11 +215,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>

<Logger name="com.hedera" level="info" additivity="false">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
15 changes: 0 additions & 15 deletions hedera-node/log4j2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<!-- State logs -->
<RollingFile name="StateLogs" fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>

</Appenders>
<Loggers>
<Root level="FATAL">
Expand Down Expand Up @@ -216,11 +206,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>

<Logger name="com.hedera" level="info" additivity="false">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
15 changes: 0 additions & 15 deletions hedera-node/test-clients/src/main/resources/log4j2-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,6 @@
<DefaultRolloverStrategy max="10"/>
</RollingFile>

<!-- State logs -->
<RollingFile name="StateLogs"
fileName="output/state/state-changes.log"
filePattern="output/state/state-changes-%d{yyyy-MM-dd--HH-mm-ss}-%i.log">
<PatternLayout>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} - %m{nolookups}%n</pattern>
</PatternLayout>
<SizeBasedTriggeringPolicy size="50 MB" />
<DefaultRolloverStrategy max="10"/>
</RollingFile>
</Appenders>
<Loggers>

Expand All @@ -46,11 +36,6 @@
<AppenderRef ref="TransactionStateLogs"/>
</Logger>

<!-- Send state logs to their own appender -->
<Logger name="com.swirlds.state.merkle.logging.StateLogger" level="info" additivity="false">
<AppenderRef ref="StateLogs"/>
</Logger>

<Root level="INFO">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFile"/>
Expand Down
4 changes: 0 additions & 4 deletions platform-sdk/swirlds-state-api/src/main/java/com/swirlds/state/spi/ReadableKVStateBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ public abstract class ReadableKVStateBase<K, V> implements ReadableKVState<K, V>

private static final Object marker = new Object();

/** State label used in logs, typically serviceName.stateKey */
protected final String label;

/** The state ID */
protected final int stateId;

Expand All @@ -55,7 +52,6 @@ protected ReadableKVStateBase(final int stateId, final String label) {
// This constructor is used by some consumers of the API that are outside of this repository.
protected ReadableKVStateBase(final int stateId, final String label, @NonNull ConcurrentMap<K, V> readCache) {
this.stateId = stateId;
this.label = label;
this.readCache = Objects.requireNonNull(readCache);
this.unmodifiableReadKeys = Collections.unmodifiableSet(readCache.keySet());
}
Expand Down
7 changes: 0 additions & 7 deletions ...rm-sdk/swirlds-state-api/src/test/java/com/swirlds/state/spi/ReadableKVStateBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ void testStateId() {
assertThat(state.getStateId()).isEqualTo(FRUIT_STATE_ID);
}

/** Make sure the constructor is holding onto the state label properly */
@Test
@DisplayName("The state label must match what was provided in the constructor")
void testStateLabel() {
assertThat(state.label).isEqualTo(FRUIT_STATE_LABEL);
}

/**
* When we are asked to get an unknown item (something not in the backing store), the {@link
* ReadableKVStateBase} still needs to remember this key and include it in the set of read keys,
Expand Down
15 changes: 2 additions & 13 deletions ...swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableKVState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
package com.swirlds.state.merkle.disk;

import static com.swirlds.state.merkle.StateUtils.getStateKeyForKv;
import static com.swirlds.state.merkle.logging.StateLogger.logMapGet;
import static com.swirlds.state.merkle.logging.StateLogger.logMapGetSize;
import static com.swirlds.state.merkle.logging.StateLogger.logMapIterate;
import static java.util.Objects.requireNonNull;

import com.hedera.pbj.runtime.Codec;
Expand Down Expand Up @@ -63,18 +60,13 @@
protected V readFromDataSource(@NonNull K key) {
final Bytes stateKey = getStateKeyForKv(stateId, key, keyCodec);
final StateValue<V> stateValue = virtualMap.get(stateKey, stateValueCodec);
final V value = stateValue != null ? stateValue.value() : null;
// Log to transaction state log, what was read
logMapGet(label, key, value);
return value;
return stateValue != null ? stateValue.value() : null;
}

/** {@inheritDoc} */
@NonNull
@Override
protected Iterator<K> iterateFromDataSource() {
// Log to transaction state log, what was iterated
logMapIterate(label, virtualMap, keyCodec);
return new OnDiskIterator<>(virtualMap, keyCodec, stateId);
}

Expand All @@ -84,10 +76,7 @@
@Override
@Deprecated
public long size() {
final var size = virtualMap.size();
// Log to transaction state log, size of map
logMapGetSize(label, size);
return size;
return virtualMap.size();

Check warning on line 79 in platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableKVState.java

View check run for this annotation

Codecov / codecov/patch

platform-sdk/swirlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableKVState.java#L79 

Added line #L79 was not covered by tests
}

@Override
Expand Down
13 changes: 2 additions & 11 deletions ...rlds-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableQueueState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// SPDX-License-Identifier: Apache-2.0
package com.swirlds.state.merkle.disk;

import static com.swirlds.state.merkle.logging.StateLogger.logQueueIterate;
import static com.swirlds.state.merkle.logging.StateLogger.logQueuePeek;

import com.hedera.pbj.runtime.Codec;
import com.swirlds.state.spi.ReadableQueueState;
import com.swirlds.state.spi.ReadableQueueStateBase;
Expand Down Expand Up @@ -45,10 +42,7 @@ public OnDiskReadableQueueState(
protected V peekOnDataSource() {
final QueueState state = onDiskQueueHelper.getState();
Objects.requireNonNull(state);
final V value = OnDiskQueueHelper.isEmpty(state) ? null : onDiskQueueHelper.getFromStore(state.head());
// Log to transaction state log, what was peeked
logQueuePeek(label, value);
return value;
return OnDiskQueueHelper.isEmpty(state) ? null : onDiskQueueHelper.getFromStore(state.head());
}

/** Iterate over all elements */
Expand All @@ -60,10 +54,7 @@ protected Iterator<V> iterateOnDataSource() {
// Empty iterator
return onDiskQueueHelper.iterateOnDataSource(0, 0);
} else {
final Iterator<V> it = onDiskQueueHelper.iterateOnDataSource(state.head(), state.tail());
// Log to transaction state log, what was iterated
logQueueIterate(label, state.tail() - state.head(), it);
return it;
return onDiskQueueHelper.iterateOnDataSource(state.head(), state.tail());
}
}
}
6 changes: 1 addition & 5 deletions ...-state-impl/src/main/java/com/swirlds/state/merkle/disk/OnDiskReadableSingletonState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
package com.swirlds.state.merkle.disk;

import static com.swirlds.state.merkle.StateUtils.getStateKeyForSingleton;
import static com.swirlds.state.merkle.logging.StateLogger.logSingletonRead;
import static java.util.Objects.requireNonNull;

import com.hedera.pbj.runtime.Codec;
Expand Down Expand Up @@ -53,9 +52,6 @@ public OnDiskReadableSingletonState(
protected V readFromDataSource() {
final Bytes key = getStateKeyForSingleton(stateId);
final StateValue<V> stateValue = virtualMap.get(key, stateValueCodec);
final V value = stateValue != null ? stateValue.value() : null;
// Log to transaction state log, what was read
logSingletonRead(label, value);
return value;
return stateValue != null ? stateValue.value() : null;
}
}
Loading
Loading