From 1acdc9ad7dc2bc77f8c9c766863a7117b4a0383a Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Tue, 15 Jul 2025 14:53:46 -0700 Subject: [PATCH 1/8] fix error when python 3.12 tests skips, versions updates --- .github/actions/lint_n_test/action.yml | 4 ++-- .github/workflows/main.yml | 2 +- .github/workflows/on_merge.yml | 2 +- .github/workflows/on_release.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/lint_n_test/action.yml b/.github/actions/lint_n_test/action.yml index 9c14bb0..a9b1c33 100644 --- a/.github/actions/lint_n_test/action.yml +++ b/.github/actions/lint_n_test/action.yml @@ -14,7 +14,7 @@ runs: using: composite steps: - name: Set up Python ${{ inputs.python_version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ inputs.python_version }} check-latest: true @@ -40,7 +40,7 @@ runs: run: python -m pydocstyle shell: bash - name: Execute Unit Tests - run: python -m unittest discover + run: python -m unittest discover -s ./test* shell: bash - name: Check Version Updated in setup.py Before Merging if: ${{ github.event_name == 'pull_request' }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f20345..66d9724 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: python_version: ['3.8', '3.9', '3.10', '3.11'] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: wavefrontHQ/wavefront-sdk-python/.github/actions/lint_n_test@master diff --git a/.github/workflows/on_merge.yml b/.github/workflows/on_merge.yml index 952d292..f99392e 100644 --- a/.github/workflows/on_merge.yml +++ b/.github/workflows/on_merge.yml @@ -24,7 +24,7 @@ jobs: PKG_REQS: ${{ inputs.requirements || needs.env0.outputs.requirements }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: wavefrontHQ/wavefront-sdk-python/.github/actions/lint_n_test@master diff --git a/.github/workflows/on_release.yml b/.github/workflows/on_release.yml index 925b4ee..164a4d2 100644 --- a/.github/workflows/on_release.yml +++ b/.github/workflows/on_release.yml @@ -24,7 +24,7 @@ jobs: PKG_REQS: ${{ inputs.requirements || needs.env0.outputs.requirements }} runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: wavefrontHQ/wavefront-sdk-python/.github/actions/lint_n_test@master From 7bd2e667f304d25c4e418d5d82933eb24104d4f4 Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Tue, 15 Jul 2025 15:04:06 -0700 Subject: [PATCH 2/8] fix for jenkins jobs --- wavefront_sdk/entities/event/sender.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wavefront_sdk/entities/event/sender.py b/wavefront_sdk/entities/event/sender.py index 693fc5c..b702e49 100644 --- a/wavefront_sdk/entities/event/sender.py +++ b/wavefront_sdk/entities/event/sender.py @@ -8,7 +8,7 @@ class WavefrontEventSender(object): """Interface of Event Sender for both clients.""" - # pylint: disable=too-many-arguments + # pylint: disable=too-many-arguments, too-many-positional-arguments def send_event(self, name, start_time, end_time, source, tags, annotations): """Send Event Data. From fb3cf26424bc49650d20f843631c693ab8244104 Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Tue, 15 Jul 2025 15:28:43 -0700 Subject: [PATCH 3/8] Add pylint disable=too-many-positional-arguments(R0917) --- wavefront_sdk/client.py | 10 +++++----- wavefront_sdk/client_factory.py | 2 +- wavefront_sdk/common/application_tags.py | 2 +- wavefront_sdk/common/heartbeater_service.py | 2 +- wavefront_sdk/common/metrics/registry.py | 2 +- wavefront_sdk/common/proxy_connection_handler.py | 2 +- wavefront_sdk/common/utils.py | 2 +- wavefront_sdk/direct.py | 4 ++-- wavefront_sdk/entities/event/sender.py | 2 +- wavefront_sdk/entities/histogram/sender.py | 2 +- wavefront_sdk/entities/metrics/sender.py | 2 +- wavefront_sdk/entities/tracing/sender.py | 2 +- wavefront_sdk/multi_clients.py | 6 +++--- wavefront_sdk/proxy.py | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/wavefront_sdk/client.py b/wavefront_sdk/client.py index 35ba9c0..73b3750 100644 --- a/wavefront_sdk/client.py +++ b/wavefront_sdk/client.py @@ -56,7 +56,7 @@ class WavefrontClient(connection_handler.ConnectionHandler, def __init__(self, server, token, max_queue_size=50000, batch_size=10000, flush_interval_seconds=5, enable_internal_metrics=True, queue_impl=queue.Queue): - # pylint: disable=too-many-arguments,too-many-statements + # pylint: disable=R0913,R0917,too-many-statements """Construct Direct Client. @param server: Server address, @@ -335,7 +335,7 @@ def close(self): self._sdk_metrics_registry.close(timeout_secs=1) def send_metric(self, name, value, timestamp, source, tags): - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 """Send Metric Data via proxy/direct ingestion client. Wavefront Metrics Data format @@ -382,7 +382,7 @@ def send_metric_now(self, metrics): def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 """Send Distribution Data via proxy/direct ingestion client. Wavefront Histogram Data format @@ -433,7 +433,7 @@ def send_distribution_now(self, distributions): def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 """Send span data via proxy/direct ingestion client. Wavefront Tracing Span Data format @@ -521,7 +521,7 @@ def send_span_log_now(self, span_logs): def send_event(self, name, start_time, end_time, source, tags, annotations): - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 """Send Event Data via proxy/direct ingestion client. Wavefront Event Data format diff --git a/wavefront_sdk/client_factory.py b/wavefront_sdk/client_factory.py index 18fd89a..2b679dc 100644 --- a/wavefront_sdk/client_factory.py +++ b/wavefront_sdk/client_factory.py @@ -31,7 +31,7 @@ def __init__(self): """Keep track of initialized clients on instance level.""" self.clients = [] - # pylint: disable=too-many-arguments,too-many-locals + # pylint: disable=R0913,R0917, too-many-locals def add_client(self, url, max_queue_size=50000, batch_size=10000, flush_interval_seconds=5, enable_internal_metrics=True, queue_impl=queue.Queue, diff --git a/wavefront_sdk/common/application_tags.py b/wavefront_sdk/common/application_tags.py index 42531af..d6073e2 100644 --- a/wavefront_sdk/common/application_tags.py +++ b/wavefront_sdk/common/application_tags.py @@ -16,7 +16,7 @@ class ApplicationTags(object): """Metadata about your application represented as tags in Wavefront.""" - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def __init__(self, application, service, cluster=None, shard=None, custom_tags=None): """Construct ApplicationTags. diff --git a/wavefront_sdk/common/heartbeater_service.py b/wavefront_sdk/common/heartbeater_service.py index 07adf24..f228150 100644 --- a/wavefront_sdk/common/heartbeater_service.py +++ b/wavefront_sdk/common/heartbeater_service.py @@ -24,7 +24,7 @@ class HeartbeaterService(object): """Service that periodically reports component heartbeats to Wavefront.""" - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def __init__(self, wavefront_client, application_tags, components, source): """Construct HeartbeaterService. diff --git a/wavefront_sdk/common/metrics/registry.py b/wavefront_sdk/common/metrics/registry.py index 9aee428..a08dc2c 100644 --- a/wavefront_sdk/common/metrics/registry.py +++ b/wavefront_sdk/common/metrics/registry.py @@ -15,7 +15,7 @@ class WavefrontSdkMetricsRegistry(object): """Wavefront SDK Metrics Registry.""" - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def __init__(self, wf_metric_sender, source=None, tags=None, prefix=None, reporting_interval_secs=60): """Construct Wavefront SDK Metrics Registry.""" diff --git a/wavefront_sdk/common/proxy_connection_handler.py b/wavefront_sdk/common/proxy_connection_handler.py index 6657d5a..dc05cd7 100644 --- a/wavefront_sdk/common/proxy_connection_handler.py +++ b/wavefront_sdk/common/proxy_connection_handler.py @@ -17,7 +17,7 @@ class ProxyConnectionHandler(connection_handler.ConnectionHandler): For sending data to a Wavefront proxy listening on a given port. """ - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def __init__(self, address, port, wavefront_sdk_metrics_registry, entity_prefix=None, timeout=None): """Construct ProxyConnectionHandler. diff --git a/wavefront_sdk/common/utils.py b/wavefront_sdk/common/utils.py index 3115a32..6376f29 100644 --- a/wavefront_sdk/common/utils.py +++ b/wavefront_sdk/common/utils.py @@ -191,7 +191,7 @@ def validate_annotations(annotations): + key) -# pylint: disable=too-many-arguments +# pylint: disable=R0913,R0917 def metric_to_line_data(name, value, timestamp, source, tags, default_source): """Metric Data to String. diff --git a/wavefront_sdk/direct.py b/wavefront_sdk/direct.py index a29c2a0..b0fdb96 100644 --- a/wavefront_sdk/direct.py +++ b/wavefront_sdk/direct.py @@ -46,7 +46,7 @@ class WavefrontDirectClient(connection_handler.ConnectionHandler, EVENT_END_POINT = '/api/v2/event' HTTP_TIMEOUT = 60.0 - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 # pylint: disable=too-many-statements def __init__(self, @@ -465,7 +465,7 @@ def send_distribution_now(self, distributions): 'histograms', self._histograms_report_errors, self._histograms_buffer, self._histograms_dropped) - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): diff --git a/wavefront_sdk/entities/event/sender.py b/wavefront_sdk/entities/event/sender.py index b702e49..f420d25 100644 --- a/wavefront_sdk/entities/event/sender.py +++ b/wavefront_sdk/entities/event/sender.py @@ -8,7 +8,7 @@ class WavefrontEventSender(object): """Interface of Event Sender for both clients.""" - # pylint: disable=too-many-arguments, too-many-positional-arguments + # pylint: disable=R0913,R0917 def send_event(self, name, start_time, end_time, source, tags, annotations): """Send Event Data. diff --git a/wavefront_sdk/entities/histogram/sender.py b/wavefront_sdk/entities/histogram/sender.py index ec0e6f6..3de2837 100644 --- a/wavefront_sdk/entities/histogram/sender.py +++ b/wavefront_sdk/entities/histogram/sender.py @@ -8,7 +8,7 @@ class WavefrontHistogramSender(object): """Interface of Histogram Sender for both clients.""" - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): """Send Distribution Data. diff --git a/wavefront_sdk/entities/metrics/sender.py b/wavefront_sdk/entities/metrics/sender.py index e5a776b..d897e32 100644 --- a/wavefront_sdk/entities/metrics/sender.py +++ b/wavefront_sdk/entities/metrics/sender.py @@ -15,7 +15,7 @@ class WavefrontMetricSender(object): # Δ: GREEK CAPITAL LETTER DELTA DELTA_PREFIX_2 = 'Δ' # '\u0394' - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def send_metric(self, name, value, timestamp, source, tags): """Send Metric Data. diff --git a/wavefront_sdk/entities/tracing/sender.py b/wavefront_sdk/entities/tracing/sender.py index c21cf2d..e01b912 100644 --- a/wavefront_sdk/entities/tracing/sender.py +++ b/wavefront_sdk/entities/tracing/sender.py @@ -8,7 +8,7 @@ class WavefrontTracingSpanSender(object): """Tracing Span Sender Interface for both Clients.""" - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via proxy. diff --git a/wavefront_sdk/multi_clients.py b/wavefront_sdk/multi_clients.py index e091477..946413e 100644 --- a/wavefront_sdk/multi_clients.py +++ b/wavefront_sdk/multi_clients.py @@ -25,7 +25,7 @@ def with_wavefront_sender(self, client): """ self.senders[client.server] = client - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def send_metric(self, name, value, timestamp, source, tags): """Send Metric Data via direct ingestion client. @@ -60,7 +60,7 @@ def send_metric_now(self, metrics): for client in self.senders.values(): client.send_metric_now(metrics) - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): """Send Distribution Data via direct ingestion client. @@ -100,7 +100,7 @@ def send_distribution_now(self, distributions): for client in self.senders.values(): client.send_distribution_now(distributions) - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via direct ingestion client. diff --git a/wavefront_sdk/proxy.py b/wavefront_sdk/proxy.py index 7a578bb..b3712e3 100644 --- a/wavefront_sdk/proxy.py +++ b/wavefront_sdk/proxy.py @@ -30,7 +30,7 @@ class WavefrontProxyClient(entities.WavefrontMetricSender, when exceptions are thrown from any methods. """ - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def __init__(self, host, metrics_port, distribution_port, tracing_port, event_port=None, timeout=None, enable_internal_metrics=True): """Construct Proxy Client. @@ -292,7 +292,7 @@ def send_distribution_now(self, distributions): .increment_failure_count()) raise error - # pylint: disable=too-many-arguments + # pylint: disable=R0913,R0917 def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via proxy. From 1dd400c12bdce8871acc735ea318bbf34056ff1a Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Tue, 15 Jul 2025 15:36:14 -0700 Subject: [PATCH 4/8] bump version and python versions --- .github/workflows/main.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 66d9724..9e8d3f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: # TODO: Enable Windows and macos # https://jira.eng.vmware.com/browse/MONIT-30833 os: [ubuntu-latest] # , macos-latest, windows-latest] - python_version: ['3.8', '3.9', '3.10', '3.11'] + python_version: ['3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/setup.py b/setup.py index e3236cb..6d43714 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setuptools.setup( name='wavefront-sdk-python', - version='2.1.0', # Please update with each pull request. + version='2.1.1', # Please update with each pull request. author='VMware Aria Operations for Applications Team', url='https://github.com/wavefrontHQ/wavefront-sdk-python', license='Apache-2.0', From 158d267cde0926f6a051807998f898ab8493cf11 Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Tue, 15 Jul 2025 22:16:21 -0700 Subject: [PATCH 5/8] add disable warning name for readability --- wavefront_sdk/client.py | 11 ++++++----- wavefront_sdk/client_factory.py | 3 ++- wavefront_sdk/common/application_tags.py | 2 +- wavefront_sdk/common/heartbeater_service.py | 2 +- wavefront_sdk/common/metrics/registry.py | 2 +- wavefront_sdk/common/proxy_connection_handler.py | 2 +- wavefront_sdk/direct.py | 4 ++-- wavefront_sdk/entities/event/sender.py | 2 +- wavefront_sdk/entities/histogram/sender.py | 2 +- wavefront_sdk/entities/metrics/sender.py | 3 +-- wavefront_sdk/entities/tracing/sender.py | 2 +- wavefront_sdk/multi_clients.py | 6 +++--- wavefront_sdk/proxy.py | 4 ++-- 13 files changed, 23 insertions(+), 22 deletions(-) diff --git a/wavefront_sdk/client.py b/wavefront_sdk/client.py index 73b3750..3aed40f 100644 --- a/wavefront_sdk/client.py +++ b/wavefront_sdk/client.py @@ -56,7 +56,8 @@ class WavefrontClient(connection_handler.ConnectionHandler, def __init__(self, server, token, max_queue_size=50000, batch_size=10000, flush_interval_seconds=5, enable_internal_metrics=True, queue_impl=queue.Queue): - # pylint: disable=R0913,R0917,too-many-statements + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-statements """Construct Direct Client. @param server: Server address, @@ -335,7 +336,7 @@ def close(self): self._sdk_metrics_registry.close(timeout_secs=1) def send_metric(self, name, value, timestamp, source, tags): - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments """Send Metric Data via proxy/direct ingestion client. Wavefront Metrics Data format @@ -382,7 +383,7 @@ def send_metric_now(self, metrics): def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments """Send Distribution Data via proxy/direct ingestion client. Wavefront Histogram Data format @@ -433,7 +434,7 @@ def send_distribution_now(self, distributions): def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments """Send span data via proxy/direct ingestion client. Wavefront Tracing Span Data format @@ -521,7 +522,7 @@ def send_span_log_now(self, span_logs): def send_event(self, name, start_time, end_time, source, tags, annotations): - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments """Send Event Data via proxy/direct ingestion client. Wavefront Event Data format diff --git a/wavefront_sdk/client_factory.py b/wavefront_sdk/client_factory.py index 2b679dc..09619b3 100644 --- a/wavefront_sdk/client_factory.py +++ b/wavefront_sdk/client_factory.py @@ -31,7 +31,8 @@ def __init__(self): """Keep track of initialized clients on instance level.""" self.clients = [] - # pylint: disable=R0913,R0917, too-many-locals + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-locals def add_client(self, url, max_queue_size=50000, batch_size=10000, flush_interval_seconds=5, enable_internal_metrics=True, queue_impl=queue.Queue, diff --git a/wavefront_sdk/common/application_tags.py b/wavefront_sdk/common/application_tags.py index d6073e2..8c3c78f 100644 --- a/wavefront_sdk/common/application_tags.py +++ b/wavefront_sdk/common/application_tags.py @@ -16,7 +16,7 @@ class ApplicationTags(object): """Metadata about your application represented as tags in Wavefront.""" - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def __init__(self, application, service, cluster=None, shard=None, custom_tags=None): """Construct ApplicationTags. diff --git a/wavefront_sdk/common/heartbeater_service.py b/wavefront_sdk/common/heartbeater_service.py index f228150..d22b9a0 100644 --- a/wavefront_sdk/common/heartbeater_service.py +++ b/wavefront_sdk/common/heartbeater_service.py @@ -24,7 +24,7 @@ class HeartbeaterService(object): """Service that periodically reports component heartbeats to Wavefront.""" - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def __init__(self, wavefront_client, application_tags, components, source): """Construct HeartbeaterService. diff --git a/wavefront_sdk/common/metrics/registry.py b/wavefront_sdk/common/metrics/registry.py index a08dc2c..fd5d545 100644 --- a/wavefront_sdk/common/metrics/registry.py +++ b/wavefront_sdk/common/metrics/registry.py @@ -15,7 +15,7 @@ class WavefrontSdkMetricsRegistry(object): """Wavefront SDK Metrics Registry.""" - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def __init__(self, wf_metric_sender, source=None, tags=None, prefix=None, reporting_interval_secs=60): """Construct Wavefront SDK Metrics Registry.""" diff --git a/wavefront_sdk/common/proxy_connection_handler.py b/wavefront_sdk/common/proxy_connection_handler.py index dc05cd7..8ae4952 100644 --- a/wavefront_sdk/common/proxy_connection_handler.py +++ b/wavefront_sdk/common/proxy_connection_handler.py @@ -17,7 +17,7 @@ class ProxyConnectionHandler(connection_handler.ConnectionHandler): For sending data to a Wavefront proxy listening on a given port. """ - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def __init__(self, address, port, wavefront_sdk_metrics_registry, entity_prefix=None, timeout=None): """Construct ProxyConnectionHandler. diff --git a/wavefront_sdk/direct.py b/wavefront_sdk/direct.py index b0fdb96..1de0f2f 100644 --- a/wavefront_sdk/direct.py +++ b/wavefront_sdk/direct.py @@ -46,7 +46,7 @@ class WavefrontDirectClient(connection_handler.ConnectionHandler, EVENT_END_POINT = '/api/v2/event' HTTP_TIMEOUT = 60.0 - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments # pylint: disable=too-many-statements def __init__(self, @@ -465,7 +465,7 @@ def send_distribution_now(self, distributions): 'histograms', self._histograms_report_errors, self._histograms_buffer, self._histograms_dropped) - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): diff --git a/wavefront_sdk/entities/event/sender.py b/wavefront_sdk/entities/event/sender.py index f420d25..3ebacbc 100644 --- a/wavefront_sdk/entities/event/sender.py +++ b/wavefront_sdk/entities/event/sender.py @@ -8,7 +8,7 @@ class WavefrontEventSender(object): """Interface of Event Sender for both clients.""" - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_event(self, name, start_time, end_time, source, tags, annotations): """Send Event Data. diff --git a/wavefront_sdk/entities/histogram/sender.py b/wavefront_sdk/entities/histogram/sender.py index 3de2837..03efa66 100644 --- a/wavefront_sdk/entities/histogram/sender.py +++ b/wavefront_sdk/entities/histogram/sender.py @@ -8,7 +8,7 @@ class WavefrontHistogramSender(object): """Interface of Histogram Sender for both clients.""" - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): """Send Distribution Data. diff --git a/wavefront_sdk/entities/metrics/sender.py b/wavefront_sdk/entities/metrics/sender.py index d897e32..01efd08 100644 --- a/wavefront_sdk/entities/metrics/sender.py +++ b/wavefront_sdk/entities/metrics/sender.py @@ -4,7 +4,6 @@ """ from __future__ import unicode_literals - # pylint: disable=E0012,R0205 class WavefrontMetricSender(object): """Interface of Metric Sender for both clients.""" @@ -15,7 +14,7 @@ class WavefrontMetricSender(object): # Δ: GREEK CAPITAL LETTER DELTA DELTA_PREFIX_2 = 'Δ' # '\u0394' - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_metric(self, name, value, timestamp, source, tags): """Send Metric Data. diff --git a/wavefront_sdk/entities/tracing/sender.py b/wavefront_sdk/entities/tracing/sender.py index e01b912..7274a2b 100644 --- a/wavefront_sdk/entities/tracing/sender.py +++ b/wavefront_sdk/entities/tracing/sender.py @@ -8,7 +8,7 @@ class WavefrontTracingSpanSender(object): """Tracing Span Sender Interface for both Clients.""" - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via proxy. diff --git a/wavefront_sdk/multi_clients.py b/wavefront_sdk/multi_clients.py index 946413e..2f8cc13 100644 --- a/wavefront_sdk/multi_clients.py +++ b/wavefront_sdk/multi_clients.py @@ -25,7 +25,7 @@ def with_wavefront_sender(self, client): """ self.senders[client.server] = client - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_metric(self, name, value, timestamp, source, tags): """Send Metric Data via direct ingestion client. @@ -60,7 +60,7 @@ def send_metric_now(self, metrics): for client in self.senders.values(): client.send_metric_now(metrics) - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): """Send Distribution Data via direct ingestion client. @@ -100,7 +100,7 @@ def send_distribution_now(self, distributions): for client in self.senders.values(): client.send_distribution_now(distributions) - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via direct ingestion client. diff --git a/wavefront_sdk/proxy.py b/wavefront_sdk/proxy.py index b3712e3..af0166b 100644 --- a/wavefront_sdk/proxy.py +++ b/wavefront_sdk/proxy.py @@ -30,7 +30,7 @@ class WavefrontProxyClient(entities.WavefrontMetricSender, when exceptions are thrown from any methods. """ - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def __init__(self, host, metrics_port, distribution_port, tracing_port, event_port=None, timeout=None, enable_internal_metrics=True): """Construct Proxy Client. @@ -292,7 +292,7 @@ def send_distribution_now(self, distributions): .increment_failure_count()) raise error - # pylint: disable=R0913,R0917 + # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via proxy. From 5848a6b04602edbb5844edfca5e464437bea5062 Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Tue, 15 Jul 2025 22:49:03 -0700 Subject: [PATCH 6/8] Apply suggestions from code review: use literal instead of code Co-authored-by: Artem Ustinov --- wavefront_sdk/client.py | 10 +++++----- wavefront_sdk/client_factory.py | 2 +- wavefront_sdk/common/application_tags.py | 2 +- wavefront_sdk/common/heartbeater_service.py | 2 +- wavefront_sdk/common/metrics/registry.py | 2 +- wavefront_sdk/common/proxy_connection_handler.py | 2 +- wavefront_sdk/direct.py | 4 ++-- wavefront_sdk/entities/event/sender.py | 2 +- wavefront_sdk/entities/histogram/sender.py | 2 +- wavefront_sdk/entities/metrics/sender.py | 2 +- wavefront_sdk/entities/tracing/sender.py | 2 +- wavefront_sdk/multi_clients.py | 6 +++--- wavefront_sdk/proxy.py | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/wavefront_sdk/client.py b/wavefront_sdk/client.py index 3aed40f..26ef7db 100644 --- a/wavefront_sdk/client.py +++ b/wavefront_sdk/client.py @@ -56,7 +56,7 @@ class WavefrontClient(connection_handler.ConnectionHandler, def __init__(self, server, token, max_queue_size=50000, batch_size=10000, flush_interval_seconds=5, enable_internal_metrics=True, queue_impl=queue.Queue): - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments # pylint: disable=too-many-statements """Construct Direct Client. @@ -336,7 +336,7 @@ def close(self): self._sdk_metrics_registry.close(timeout_secs=1) def send_metric(self, name, value, timestamp, source, tags): - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments """Send Metric Data via proxy/direct ingestion client. Wavefront Metrics Data format @@ -383,7 +383,7 @@ def send_metric_now(self, metrics): def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments """Send Distribution Data via proxy/direct ingestion client. Wavefront Histogram Data format @@ -434,7 +434,7 @@ def send_distribution_now(self, distributions): def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments """Send span data via proxy/direct ingestion client. Wavefront Tracing Span Data format @@ -522,7 +522,7 @@ def send_span_log_now(self, span_logs): def send_event(self, name, start_time, end_time, source, tags, annotations): - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments """Send Event Data via proxy/direct ingestion client. Wavefront Event Data format diff --git a/wavefront_sdk/client_factory.py b/wavefront_sdk/client_factory.py index 09619b3..20f7ee3 100644 --- a/wavefront_sdk/client_factory.py +++ b/wavefront_sdk/client_factory.py @@ -31,7 +31,7 @@ def __init__(self): """Keep track of initialized clients on instance level.""" self.clients = [] - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments # pylint: disable=too-many-locals def add_client(self, url, max_queue_size=50000, batch_size=10000, flush_interval_seconds=5, enable_internal_metrics=True, diff --git a/wavefront_sdk/common/application_tags.py b/wavefront_sdk/common/application_tags.py index 8c3c78f..063d56d 100644 --- a/wavefront_sdk/common/application_tags.py +++ b/wavefront_sdk/common/application_tags.py @@ -16,7 +16,7 @@ class ApplicationTags(object): """Metadata about your application represented as tags in Wavefront.""" - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def __init__(self, application, service, cluster=None, shard=None, custom_tags=None): """Construct ApplicationTags. diff --git a/wavefront_sdk/common/heartbeater_service.py b/wavefront_sdk/common/heartbeater_service.py index d22b9a0..1494dfe 100644 --- a/wavefront_sdk/common/heartbeater_service.py +++ b/wavefront_sdk/common/heartbeater_service.py @@ -24,7 +24,7 @@ class HeartbeaterService(object): """Service that periodically reports component heartbeats to Wavefront.""" - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def __init__(self, wavefront_client, application_tags, components, source): """Construct HeartbeaterService. diff --git a/wavefront_sdk/common/metrics/registry.py b/wavefront_sdk/common/metrics/registry.py index fd5d545..51a013c 100644 --- a/wavefront_sdk/common/metrics/registry.py +++ b/wavefront_sdk/common/metrics/registry.py @@ -15,7 +15,7 @@ class WavefrontSdkMetricsRegistry(object): """Wavefront SDK Metrics Registry.""" - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def __init__(self, wf_metric_sender, source=None, tags=None, prefix=None, reporting_interval_secs=60): """Construct Wavefront SDK Metrics Registry.""" diff --git a/wavefront_sdk/common/proxy_connection_handler.py b/wavefront_sdk/common/proxy_connection_handler.py index 8ae4952..799402f 100644 --- a/wavefront_sdk/common/proxy_connection_handler.py +++ b/wavefront_sdk/common/proxy_connection_handler.py @@ -17,7 +17,7 @@ class ProxyConnectionHandler(connection_handler.ConnectionHandler): For sending data to a Wavefront proxy listening on a given port. """ - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def __init__(self, address, port, wavefront_sdk_metrics_registry, entity_prefix=None, timeout=None): """Construct ProxyConnectionHandler. diff --git a/wavefront_sdk/direct.py b/wavefront_sdk/direct.py index 1de0f2f..07c4b17 100644 --- a/wavefront_sdk/direct.py +++ b/wavefront_sdk/direct.py @@ -46,7 +46,7 @@ class WavefrontDirectClient(connection_handler.ConnectionHandler, EVENT_END_POINT = '/api/v2/event' HTTP_TIMEOUT = 60.0 - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments # pylint: disable=too-many-statements def __init__(self, @@ -465,7 +465,7 @@ def send_distribution_now(self, distributions): 'histograms', self._histograms_report_errors, self._histograms_buffer, self._histograms_dropped) - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): diff --git a/wavefront_sdk/entities/event/sender.py b/wavefront_sdk/entities/event/sender.py index 3ebacbc..beafbc1 100644 --- a/wavefront_sdk/entities/event/sender.py +++ b/wavefront_sdk/entities/event/sender.py @@ -8,7 +8,7 @@ class WavefrontEventSender(object): """Interface of Event Sender for both clients.""" - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_event(self, name, start_time, end_time, source, tags, annotations): """Send Event Data. diff --git a/wavefront_sdk/entities/histogram/sender.py b/wavefront_sdk/entities/histogram/sender.py index 03efa66..c9fa68d 100644 --- a/wavefront_sdk/entities/histogram/sender.py +++ b/wavefront_sdk/entities/histogram/sender.py @@ -8,7 +8,7 @@ class WavefrontHistogramSender(object): """Interface of Histogram Sender for both clients.""" - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): """Send Distribution Data. diff --git a/wavefront_sdk/entities/metrics/sender.py b/wavefront_sdk/entities/metrics/sender.py index 01efd08..676d262 100644 --- a/wavefront_sdk/entities/metrics/sender.py +++ b/wavefront_sdk/entities/metrics/sender.py @@ -14,7 +14,7 @@ class WavefrontMetricSender(object): # Δ: GREEK CAPITAL LETTER DELTA DELTA_PREFIX_2 = 'Δ' # '\u0394' - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_metric(self, name, value, timestamp, source, tags): """Send Metric Data. diff --git a/wavefront_sdk/entities/tracing/sender.py b/wavefront_sdk/entities/tracing/sender.py index 7274a2b..8eb36a2 100644 --- a/wavefront_sdk/entities/tracing/sender.py +++ b/wavefront_sdk/entities/tracing/sender.py @@ -8,7 +8,7 @@ class WavefrontTracingSpanSender(object): """Tracing Span Sender Interface for both Clients.""" - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via proxy. diff --git a/wavefront_sdk/multi_clients.py b/wavefront_sdk/multi_clients.py index 2f8cc13..352e8b2 100644 --- a/wavefront_sdk/multi_clients.py +++ b/wavefront_sdk/multi_clients.py @@ -25,7 +25,7 @@ def with_wavefront_sender(self, client): """ self.senders[client.server] = client - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_metric(self, name, value, timestamp, source, tags): """Send Metric Data via direct ingestion client. @@ -60,7 +60,7 @@ def send_metric_now(self, metrics): for client in self.senders.values(): client.send_metric_now(metrics) - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_distribution(self, name, centroids, histogram_granularities, timestamp, source, tags): """Send Distribution Data via direct ingestion client. @@ -100,7 +100,7 @@ def send_distribution_now(self, distributions): for client in self.senders.values(): client.send_distribution_now(distributions) - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via direct ingestion client. diff --git a/wavefront_sdk/proxy.py b/wavefront_sdk/proxy.py index af0166b..abdf35d 100644 --- a/wavefront_sdk/proxy.py +++ b/wavefront_sdk/proxy.py @@ -30,7 +30,7 @@ class WavefrontProxyClient(entities.WavefrontMetricSender, when exceptions are thrown from any methods. """ - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def __init__(self, host, metrics_port, distribution_port, tracing_port, event_port=None, timeout=None, enable_internal_metrics=True): """Construct Proxy Client. @@ -292,7 +292,7 @@ def send_distribution_now(self, distributions): .increment_failure_count()) raise error - # pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments + # pylint: disable=too-many-arguments,too-many-positional-arguments def send_span(self, name, start_millis, duration_millis, source, trace_id, span_id, parents, follows_from, tags, span_logs): """Send span data via proxy. From 000c276a87b97e8d289cad06c2378b97b51b769f Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Tue, 15 Jul 2025 22:52:16 -0700 Subject: [PATCH 7/8] add extra line again for format --- wavefront_sdk/entities/metrics/sender.py | 1 + 1 file changed, 1 insertion(+) diff --git a/wavefront_sdk/entities/metrics/sender.py b/wavefront_sdk/entities/metrics/sender.py index 676d262..39da84a 100644 --- a/wavefront_sdk/entities/metrics/sender.py +++ b/wavefront_sdk/entities/metrics/sender.py @@ -4,6 +4,7 @@ """ from __future__ import unicode_literals + # pylint: disable=E0012,R0205 class WavefrontMetricSender(object): """Interface of Metric Sender for both clients.""" From bfc99c2ffd4835bcce836862418ef16078626648 Mon Sep 17 00:00:00 2001 From: Joanna Ko Date: Tue, 15 Jul 2025 22:57:54 -0700 Subject: [PATCH 8/8] missed one, adding literal form --- wavefront_sdk/common/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wavefront_sdk/common/utils.py b/wavefront_sdk/common/utils.py index 6376f29..0808cde 100644 --- a/wavefront_sdk/common/utils.py +++ b/wavefront_sdk/common/utils.py @@ -191,7 +191,7 @@ def validate_annotations(annotations): + key) -# pylint: disable=R0913,R0917 +# pylint: disable=too-many-arguments,too-many-positional-arguments def metric_to_line_data(name, value, timestamp, source, tags, default_source): """Metric Data to String.