Skip to content

refactor: remove classDescriptorsManager from CoverageManager and Dri… #196

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
RomanDavlyatshin merged 1 commit into from
Oct 27, 2025
Merged

refactor: remove classDescriptorsManager from CoverageManager and Dri… #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion test2code/src/main/kotlin/com/epam/drill/agent/test2code/Test2Code.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Test2Code(
internal val json = Json { encodeDefaults = true }

private val coverageManager = DrillCoverageManager
private val instrumenter = DrillInstrumenter(coverageManager, coverageManager)
private val instrumenter = DrillInstrumenter(coverageManager)
private val coverageSender: CoverageSender = IntervalCoverageSender(
groupId = configuration.agentMetadata.groupId,
appId = configuration.agentMetadata.appId,
Expand Down
58 changes: 0 additions & 58 deletions test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/ClassDescriptorProvider.kt
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/CoverageManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ package com.epam.drill.agent.test2code.coverage
import com.epam.drill.agent.jacoco.AgentProbes

open class CoverageManager(
private val classDescriptorsManager: IClassDescriptorsManager = ConcurrentClassDescriptorsManager(),
private val threadCoverageRecorder: ICoverageRecorder = ThreadCoverageRecorder(),
private val globalCoverageRecorder: GlobalCoverageRecorder = GlobalCoverageRecorder(),
) : IProbesProxy,
IClassDescriptorStorage by classDescriptorsManager,
ICoverageRecorder by threadCoverageRecorder {

override fun invoke(
Expand All @@ -34,11 +32,10 @@ open class CoverageManager(
val coverage: ContextCoverage = threadCoverageRecorder.getContext()
?: globalCoverageRecorder.getContext()
val execDatum = coverage.execData.getOrPut(id) {
val classDescriptor = classDescriptorsManager.get(id)
ExecDatum(
id = classDescriptor.id,
name = classDescriptor.name,
probes = AgentProbes(classDescriptor.probeCount),
id = id,
name = name,
probes = AgentProbes(probeCount),
sessionId = coverage.context.sessionId,
testId = coverage.context.testId
)
Expand Down
10 changes: 0 additions & 10 deletions test2code/src/main/kotlin/com/epam/drill/agent/test2code/coverage/Instrumentation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ private val classCounter = AtomicInteger(0)

class DrillInstrumenter(
private val probesProxy: IProbesProxy,
private val classDescriptorsStorage: IClassDescriptorStorage
) : Instrumenter {

private val logger = KotlinLogging.logger {}
Expand Down Expand Up @@ -64,15 +63,6 @@ class DrillInstrumenter(
InstrSupport.needsFrames(version)
)
reader.accept(visitor, ClassReader.EXPAND_FRAMES)

classDescriptorsStorage.add(
ClassDescriptor(
id = classId,
name = className,
probeCount = probeCount
)
)

writer.toByteArray()
} catch (e: Exception) {
logger.error { "Error instrumenting $className: ${e.message} ${e.stackTraceToString()}" }
Expand Down
Loading