Skip to content

Commit

Permalink
fix: format files for lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Willian Cesar Cincerre Da Silva committed Jan 26, 2025
1 parent 0699b20 commit 1c87943
Show file tree
Hide file tree
Showing 23 changed files with 84 additions and 530 deletions.
9 changes: 9 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ coverage:
target: 75
flags:
- redpanda
Resilience4j:
target: 75
flags:
- resilience4j
Riak_MDC_Replication:
target: 75
flags:
Expand Down Expand Up @@ -577,6 +581,11 @@ flags:
paths:
- redpanda/datadog_checks/redpanda
- redpanda/tests
resilience4j:
carryforward: true
paths:
- resilience4j/datadog_checks/resilience4j
- resilience4j/tests
riak_repl:
carryforward: true
paths:
Expand Down
7 changes: 4 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
/redis_enterprise/ @redis-field-engineering [email protected]
/redis_sentinel/ @DataDog/agent-integrations
/redpanda/ @redpanda-data [email protected]
/resilience4j/ [email protected]
/resin/ @brentm5
/retool/ @jamiecuffe @DataDog/ecosystems-review
/riak_repl/ @abtreece
Expand Down Expand Up @@ -318,7 +319,7 @@
/aqua/*metadata.csv @DataDog/container-integrations @DataDog/documentation
/aqua/manifest.json @DataDog/container-integrations @DataDog/documentation
/aqua/README.md @DataDog/container-integrations @DataDog/documentation
/aqua/assets/dashboards @DataDog/container-integrations @DataDog/documentation @DataDog/reporting-and-sharing
/aqua/assets/dashboards @DataDog/container-integrations @DataDog/documentation @DataDog/reporting-and-sharing
/aqua/assets/monitors @DataDog/container-integrations @DataDog/documentation @DataDog/alerting-product

/auth0/*metadata.csv @DataDog/agent-integrations @DataDog/documentation
Expand Down Expand Up @@ -1098,8 +1099,8 @@
/sosivio/assets/dashboards @danarlowski @DataDog/documentation @DataDog/reporting-and-sharing @DataDog/agent-integrations
/sosivio/assets/monitors @danarlowski @DataDog/documentation @DataDog/alerting-product @DataDog/agent-integrations

/emnify/*metadata.csv @EMnify/development @EMnify/rademade @DataDog/documentation
/emnify/manifest.json @EMnify/development @EMnify/rademade @DataDog/documentation
/emnify/*metadata.csv @EMnify/development @EMnify/rademade @DataDog/documentation
/emnify/manifest.json @EMnify/development @EMnify/rademade @DataDog/documentation
/emnify/README.md @EMnify/development @EMnify/rademade @DataDog/documentation
/emnify/assets/dashboards @EMnify/development @EMnify/rademade @DataDog/documentation @DataDog/reporting-and-sharing
/emnify/assets/monitors @EMnify/development @EMnify/rademade @DataDog/documentation @DataDog/alerting-product
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,25 @@ jobs:
test-py3: ${{ inputs.test-py3 }}
setup-env-vars: "${{ inputs.setup-env-vars }}"
secrets: inherit
j09df637:
uses: DataDog/integrations-core/.github/workflows/test-target.yml@master
with:
job-name: Resilience4j
target: resilience4j
platform: linux
runner: '["ubuntu-22.04"]'
repo: "${{ inputs.repo }}"
python-version: "${{ inputs.python-version }}"
standard: ${{ inputs.standard }}
latest: ${{ inputs.latest }}
agent-image: "${{ inputs.agent-image }}"
agent-image-py2: "${{ inputs.agent-image-py2 }}"
agent-image-windows: "${{ inputs.agent-image-windows }}"
agent-image-windows-py2: "${{ inputs.agent-image-windows-py2 }}"
test-py2: ${{ inputs.test-py2 }}
test-py3: ${{ inputs.test-py3 }}
setup-env-vars: "${{ inputs.setup-env-vars }}"
secrets: inherit
jc5ec7c0:
uses: DataDog/integrations-core/.github/workflows/test-target.yml@master
with:
Expand Down
2 changes: 1 addition & 1 deletion resilience4j/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG - Resilience4j

## 1.0.0 / YYYY-MM-DD
## 1.0.0 / 2025-01-24

***Added***:

Expand Down
3 changes: 2 additions & 1 deletion resilience4j/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ See [metadata.csv][7] for a list of metrics provided by this integration.

### Service Checks

See [service_checks.json][11] for a list of service checks provided by this integration.
See [service_checks.json][8] for a list of service checks provided by this integration.

### Events

Expand All @@ -57,3 +57,4 @@ Need help? Contact [Datadog support][3].
[5]: https://docs.datadoghq.com/agent/guide/agent-commands/#start-stop-and-restart-the-agent
[6]: https://docs.datadoghq.com/agent/guide/agent-commands/#agent-status-and-information
[7]: https://github.com/DataDog/integrations-extras/blob/master/resilience4j/metadata.csv
[8]: https://github.com/DataDog/integrations-extras/blob/master/resilience4j/assets/service_checks.json
2 changes: 1 addition & 1 deletion resilience4j/assets/dashboards/resilience4j_overview.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Please build an out-of-the-box dashboard for your integration following our best practices here: https://datadoghq.dev/integrations-core/guidelines/dashboards/#best-practices
{"title":"Resilience4j Circuit Breaker Overview","description":"This dashboard is designed to monitor the health and performance of Resilience4j Circuit Breakers and providing insights into the behavior of the circuit breakers in a Spring Boot application. It uses Spring Boot Actuator to expose metrics and Prometheus to collect and store these metrics. \n\n- [Resilience4j Metrics](https://resilience4j.readme.io/docs/micrometer#prometheus)\nClone this template dashboard to make changes and add your own graph widgets.","widgets":[{"id":3501442757873750,"definition":{"title":"Summary","background_color":"gray","show_title":true,"type":"group","layout_type":"ordered","widgets":[{"id":3494549748379606,"definition":{"title":"Number of closed CircuitBreaker","title_size":"16","title_align":"left","type":"query_value","requests":[{"response_format":"scalar","queries":[{"data_source":"metrics","name":"query1","query":"avg:resilience4j.circuitbreaker.state{state:closed}","aggregator":"last"}],"conditional_formats":[{"comparator":">","value":0,"palette":"white_on_green"}],"formulas":[{"formula":"query1"}]}],"autoscale":true,"precision":0,"timeseries_background":{"yaxis":{"include_zero":true},"type":"area"}},"layout":{"x":0,"y":0,"width":4,"height":2}},{"id":5787006276604120,"definition":{"title":"Number of open CircuitBreaker","title_size":"16","title_align":"left","type":"query_value","requests":[{"response_format":"scalar","queries":[{"data_source":"metrics","name":"query1","query":"avg:resilience4j.circuitbreaker.state{state:open}","aggregator":"last"}],"conditional_formats":[{"comparator":"=","value":0,"palette":"white_on_green"},{"comparator":">=","value":1,"palette":"white_on_yellow"}],"formulas":[{"formula":"query1"}]}],"autoscale":true,"precision":0,"timeseries_background":{"yaxis":{"include_zero":true},"type":"area"}},"layout":{"x":4,"y":0,"width":4,"height":2}},{"id":5152242796496788,"definition":{"title":"Number of half_open CircuitBreaker","title_size":"16","title_align":"left","type":"query_value","requests":[{"response_format":"scalar","queries":[{"data_source":"metrics","name":"query1","query":"avg:resilience4j.circuitbreaker.state{state:half_open}","aggregator":"last"}],"conditional_formats":[{"comparator":"=","value":0,"palette":"white_on_green"},{"comparator":">=","value":1,"palette":"white_on_yellow"}],"formulas":[{"formula":"query1"}]}],"autoscale":true,"precision":0,"timeseries_background":{"yaxis":{"include_zero":true},"type":"area"}},"layout":{"x":8,"y":0,"width":4,"height":2}},{"id":5317812649799226,"definition":{"title":"CircuitBreaker states","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"metrics","name":"query1","query":"avg:resilience4j.circuitbreaker.state{$service,$state} by {state,service}"}],"response_format":"timeseries","style":{"palette":"dog_classic","order_by":"values","line_type":"solid","line_width":"normal"},"display_type":"line"}]},"layout":{"x":0,"y":2,"width":12,"height":4}}]},"layout":{"x":0,"y":0,"width":12,"height":7}},{"id":911329350165930,"definition":{"title":"Circuit Breaker","background_color":"yellow","show_title":true,"type":"group","layout_type":"ordered","widgets":[{"id":1469478086748770,"definition":{"title":"Failure Rate: $circuit_breaker_name","title_size":"16","title_align":"left","type":"query_value","requests":[{"response_format":"scalar","queries":[{"data_source":"metrics","name":"query1","query":"avg:resilience4j.circuitbreaker.failure.rate{$circuit_breaker_name}","aggregator":"last"}],"conditional_formats":[{"comparator":">","value":50,"palette":"white_on_red"},{"comparator":">=","value":40,"palette":"white_on_yellow"},{"comparator":"<","value":40,"palette":"white_on_green"}],"formulas":[{"formula":"default_zero(cutoff_min(query1, 0))"}]}],"autoscale":true,"precision":0,"timeseries_background":{"type":"area"}},"layout":{"x":0,"y":0,"width":6,"height":3}},{"id":5088831156945942,"definition":{"title":"Call rate: $circuit_breaker_name","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"formulas":[{"formula":"query1"},{"formula":"query2"}],"queries":[{"data_source":"metrics","name":"query1","query":"sum:resilience4j.circuitbreaker.calls.seconds.count{$service, $state}.as_rate()"},{"data_source":"metrics","name":"query2","query":"sum:resilience4j.circuitbreaker.calls.seconds.sum{$service, $state} by {service}.as_rate()"}],"response_format":"timeseries","style":{"palette":"dog_classic","order_by":"values","line_type":"solid","line_width":"normal"},"display_type":"line"}]},"layout":{"x":6,"y":0,"width":6,"height":3}},{"id":8277186327531272,"definition":{"title":"Buffered calls: $circuit_breaker_name","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"formulas":[{"formula":"query1"}],"queries":[{"data_source":"metrics","name":"query1","query":"avg:resilience4j.circuitbreaker.buffered.calls{$service, $circuit_breaker_name}"}],"response_format":"timeseries","style":{"palette":"dog_classic","order_by":"values","line_type":"solid","line_width":"normal"},"display_type":"line"}]},"layout":{"x":0,"y":3,"width":6,"height":3}},{"id":8901593457473692,"definition":{"title":"Average call durations","title_size":"16","title_align":"left","show_legend":true,"legend_layout":"auto","legend_columns":["avg","min","max","value","sum"],"type":"timeseries","requests":[{"formulas":[{"formula":"per_minute(query1)"}],"queries":[{"data_source":"metrics","name":"query1","query":"avg:resilience4j.circuitbreaker.calls.seconds.sum{$service}.as_rate()"}],"response_format":"timeseries","style":{"palette":"dog_classic","order_by":"values","line_type":"solid","line_width":"normal"},"display_type":"line"}]},"layout":{"x":6,"y":3,"width":6,"height":3}}]},"layout":{"x":0,"y":0,"width":12,"height":7,"is_column_break":true}}],"template_variables":[{"name":"service","prefix":"service","available_values":[],"default":"*"},{"name":"state","prefix":"state","available_values":["closed","disabled","forced_open","half_open","metrics_only","open"],"default":"*"},{"name":"circuit_breaker_name","prefix":"circuit_breaker_name","available_values":[],"default":"*"}],"layout_type":"ordered","notify_list":[],"reflow_type":"fixed"}
2 changes: 1 addition & 1 deletion resilience4j/assets/service_checks.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"agent_version": "7.59.0",
"integration": "resilience4j",
"integration": "Resilience4j",
"check": "resilience4j.prometheus.health",
"statuses": [
"ok",
Expand Down
1 change: 0 additions & 1 deletion resilience4j/datadog_checks/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

__path__ = __import__('pkgutil').extend_path(__path__, __name__) # type: ignore
1 change: 0 additions & 1 deletion resilience4j/datadog_checks/resilience4j/__about__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@

__version__ = '1.0.0'
1 change: 0 additions & 1 deletion resilience4j/datadog_checks/resilience4j/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

from .__about__ import __version__
from .check import Resilience4jCheck

Expand Down
4 changes: 2 additions & 2 deletions resilience4j/datadog_checks/resilience4j/check.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datadog_checks.base import OpenMetricsBaseCheck, ConfigurationError
from datadog_checks.base import ConfigurationError, OpenMetricsBaseCheck

from .metrics import METRIC_MAP

Expand Down Expand Up @@ -36,4 +36,4 @@ def check(self, instance):
if prometheus_url is None:
raise ConfigurationError("Each instance must have a url to the metrics endpoint")

super(Resilience4jCheck, self).check(instance)
super(Resilience4jCheck, self).check(instance)
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@


# This file is autogenerated.
# To change this file you should edit assets/configuration/spec.yaml and then run the following commands:
# ddev -x validate config -s <INTEGRATION_NAME>
# ddev -x validate models -s <INTEGRATION_NAME>


from .instance import InstanceConfig
from .shared import SharedConfig

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@


# This file is autogenerated.
# To change this file you should edit assets/configuration/spec.yaml and then run the following commands:
# ddev -x validate config -s <INTEGRATION_NAME>
# ddev -x validate models -s <INTEGRATION_NAME>


def instance_disable_generic_tags():
return False


def instance_empty_default_hostname():
return False

Expand Down
14 changes: 11 additions & 3 deletions resilience4j/datadog_checks/resilience4j/config_models/instance.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@


# This file is autogenerated.
# To change this file you should edit assets/configuration/spec.yaml and then run the following commands:
# ddev -x validate config -s <INTEGRATION_NAME>
# ddev -x validate models -s <INTEGRATION_NAME>


from __future__ import annotations

from typing import Optional
Expand All @@ -18,13 +15,24 @@
from . import defaults, validators


class MetricPatterns(BaseModel):
model_config = ConfigDict(
arbitrary_types_allowed=True,
frozen=True,
)
exclude: Optional[tuple[str, ...]] = None
include: Optional[tuple[str, ...]] = None


class InstanceConfig(BaseModel):
model_config = ConfigDict(
validate_default=True,
arbitrary_types_allowed=True,
frozen=True,
)
disable_generic_tags: Optional[bool] = None
empty_default_hostname: Optional[bool] = None
metric_patterns: Optional[MetricPatterns] = None
min_collection_interval: Optional[float] = None
service: Optional[str] = None
tags: Optional[tuple[str, ...]] = None
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@


# This file is autogenerated.
# To change this file you should edit assets/configuration/spec.yaml and then run the following commands:
# ddev -x validate config -s <INTEGRATION_NAME>
# ddev -x validate models -s <INTEGRATION_NAME>


from __future__ import annotations

from typing import Optional
Expand All @@ -15,7 +12,7 @@
from datadog_checks.base.utils.functions import identity
from datadog_checks.base.utils.models import validation

from . import defaults, validators
from . import validators


class SharedConfig(BaseModel):
Expand All @@ -36,8 +33,6 @@ def _validate(cls, value, info):
field_name = field.alias or info.field_name
if field_name in info.context['configured_fields']:
value = getattr(validators, f'shared_{info.field_name}', identity)(value, field=field)
else:
value = getattr(defaults, f'shared_{info.field_name}', lambda: value)()

return validation.utils.make_immutable(value)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


# Here you can include additional config validators or transformers
#
# def initialize_instance(values, **kwargs):
Expand Down
Loading

0 comments on commit 1c87943

Please sign in to comment.