-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #78 from th2-net/release-3.8.0
Release 3.8.0
- Loading branch information
Showing
17 changed files
with
900 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| release_version = 3.7.2 | ||
| release_version = 3.8.0 | ||
|
|
||
| description = 'th2 check1 box' | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
src/main/kotlin/com/exactpro/th2/check1/exception/RuleExceptions.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* | ||
| * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.exactpro.th2.check1.exception | ||
|
|
||
| open class RuleException @JvmOverloads constructor(message: String? = null, cause: Throwable? = null) : Exception(message, cause) | ||
|
|
||
| class RuleCreationException @JvmOverloads constructor(message: String? = null, cause: Throwable? = null) : RuleException(message, cause) | ||
|
|
||
| class RuleInternalException @JvmOverloads constructor(message: String? = null, cause: Throwable? = null) : RuleException(message, cause) |
49 changes: 49 additions & 0 deletions
49
src/main/kotlin/com/exactpro/th2/check1/metrics/BufferMetric.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.exactpro.th2.check1.metrics | ||
|
|
||
| import com.exactpro.th2.check1.SessionKey | ||
| import com.exactpro.th2.check1.configuration.Check1Configuration | ||
| import com.exactpro.th2.common.metrics.DEFAULT_DIRECTION_LABEL_NAME | ||
| import com.exactpro.th2.common.metrics.DEFAULT_SESSION_ALIAS_LABEL_NAME | ||
| import io.prometheus.client.Counter | ||
| import java.util.concurrent.ConcurrentHashMap | ||
| import kotlin.math.min | ||
|
|
||
| object BufferMetric { | ||
|
|
||
| private val actualBufferCountMetric: Counter = Counter | ||
| .build("th2_check1_actual_cache_number", "The actual number of messages in caches") | ||
| .labelNames(DEFAULT_SESSION_ALIAS_LABEL_NAME, DEFAULT_DIRECTION_LABEL_NAME) | ||
| .register() | ||
|
|
||
| private val bufferMessagesSizeBySessionKey: MutableMap<SessionKey, Int> = ConcurrentHashMap() | ||
| private var maxBufferSize: Int = -1 | ||
|
|
||
| fun configure(configuration: Check1Configuration) { | ||
| this.maxBufferSize = configuration.messageCacheSize | ||
| } | ||
|
|
||
| fun processMessage(sessionKey: SessionKey) { | ||
| val labels = arrayOf(sessionKey.sessionAlias, sessionKey.direction.name) | ||
|
|
||
| bufferMessagesSizeBySessionKey.compute(sessionKey) { _, old -> | ||
| min(maxBufferSize, (old ?: 0) + 1).also { | ||
| if (it != old) { | ||
| actualBufferCountMetric.labels(*labels).inc() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
31 changes: 31 additions & 0 deletions
31
src/main/kotlin/com/exactpro/th2/check1/metrics/RuleMetric.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.exactpro.th2.check1.metrics | ||
|
|
||
| import io.prometheus.client.Gauge | ||
|
|
||
| object RuleMetric { | ||
| private val ACTIVE_TASK_COUNTER = Gauge | ||
| .build("th2_check1_active_tasks_number", "The number of currently working rules") | ||
| .labelNames("rule_type") | ||
| .register() | ||
|
|
||
| fun incrementActiveRule(ruleType: String) { | ||
| ACTIVE_TASK_COUNTER.labels(ruleType).inc() | ||
| } | ||
|
|
||
| fun decrementActiveRule(ruleType: String) { | ||
| ACTIVE_TASK_COUNTER.labels(ruleType).dec() | ||
| } | ||
| } |
Oops, something went wrong.