Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
4 changes: 2 additions & 2 deletions .github/actions/lint_n_test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ 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@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: wavefrontHQ/wavefront-sdk-python/.github/actions/lint_n_test@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
11 changes: 6 additions & 5 deletions wavefront_sdk/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=too-many-arguments,too-many-statements
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
# pylint: disable=too-many-statements
"""Construct Direct Client.

@param server: Server address,
Expand Down Expand Up @@ -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=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
"""Send Metric Data via proxy/direct ingestion client.

Wavefront Metrics Data format
Expand Down Expand Up @@ -382,7 +383,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 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
"""Send Distribution Data via proxy/direct ingestion client.

Wavefront Histogram Data format
Expand Down Expand Up @@ -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=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
"""Send span data via proxy/direct ingestion client.

Wavefront Tracing Span Data format
Expand Down Expand Up @@ -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=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
"""Send Event Data via proxy/direct ingestion client.

Wavefront Event Data format
Expand Down
3 changes: 2 additions & 1 deletion wavefront_sdk/client_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ 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-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
# 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,
Expand Down
2 changes: 1 addition & 1 deletion wavefront_sdk/common/application_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def __init__(self, application, service, cluster=None, shard=None,
custom_tags=None):
"""Construct ApplicationTags.
Expand Down
2 changes: 1 addition & 1 deletion wavefront_sdk/common/heartbeater_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class HeartbeaterService(object):
"""Service that periodically reports component heartbeats to Wavefront."""

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def __init__(self, wavefront_client, application_tags, components, source):
"""Construct HeartbeaterService.

Expand Down
2 changes: 1 addition & 1 deletion wavefront_sdk/common/metrics/registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class WavefrontSdkMetricsRegistry(object):
"""Wavefront SDK Metrics Registry."""

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def __init__(self, wf_metric_sender, source=None, tags=None, prefix=None,
reporting_interval_secs=60):
"""Construct Wavefront SDK Metrics Registry."""
Expand Down
2 changes: 1 addition & 1 deletion wavefront_sdk/common/proxy_connection_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def __init__(self, address, port, wavefront_sdk_metrics_registry,
entity_prefix=None, timeout=None):
"""Construct ProxyConnectionHandler.
Expand Down
2 changes: 1 addition & 1 deletion wavefront_sdk/common/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions wavefront_sdk/direct.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
# pylint: disable=too-many-statements

def __init__(self,
Expand Down Expand Up @@ -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 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated

def send_span(self, name, start_millis, duration_millis, source, trace_id,
span_id, parents, follows_from, tags, span_logs):
Expand Down
2 changes: 1 addition & 1 deletion wavefront_sdk/entities/event/sender.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class WavefrontEventSender(object):
"""Interface of Event Sender for both clients."""

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def send_event(self, name, start_time, end_time, source,
tags, annotations):
"""Send Event Data.
Expand Down
2 changes: 1 addition & 1 deletion wavefront_sdk/entities/histogram/sender.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class WavefrontHistogramSender(object):
"""Interface of Histogram Sender for both clients."""

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def send_distribution(self, name, centroids, histogram_granularities,
timestamp, source, tags):
"""Send Distribution Data.
Expand Down
3 changes: 1 addition & 2 deletions wavefront_sdk/entities/metrics/sender.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"""
from __future__ import unicode_literals


# pylint: disable=E0012,R0205
class WavefrontMetricSender(object):
"""Interface of Metric Sender for both clients."""
Expand All @@ -15,7 +14,7 @@ class WavefrontMetricSender(object):
# Δ: GREEK CAPITAL LETTER DELTA
DELTA_PREFIX_2 = 'Δ' # '\u0394'

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def send_metric(self, name, value, timestamp, source, tags):
"""Send Metric Data.

Expand Down
2 changes: 1 addition & 1 deletion wavefront_sdk/entities/tracing/sender.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class WavefrontTracingSpanSender(object):
"""Tracing Span Sender Interface for both Clients."""

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
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.
Expand Down
6 changes: 3 additions & 3 deletions wavefront_sdk/multi_clients.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def with_wavefront_sender(self, client):
"""
self.senders[client.server] = client

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def send_metric(self, name, value, timestamp, source, tags):
"""Send Metric Data via direct ingestion client.

Expand Down Expand Up @@ -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 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def send_distribution(self, name, centroids, histogram_granularities,
timestamp, source, tags):
"""Send Distribution Data via direct ingestion client.
Expand Down Expand Up @@ -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 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
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.
Expand Down
4 changes: 2 additions & 2 deletions wavefront_sdk/proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class WavefrontProxyClient(entities.WavefrontMetricSender,
when exceptions are thrown from any methods.
"""

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
def __init__(self, host, metrics_port, distribution_port, tracing_port,
event_port=None, timeout=None, enable_internal_metrics=True):
"""Construct Proxy Client.
Expand Down Expand Up @@ -292,7 +292,7 @@ def send_distribution_now(self, distributions):
.increment_failure_count())
raise error

# pylint: disable=too-many-arguments
# pylint: disable=R0913,R0917 # too-many-arguments, too-many-positional-arguments
Comment thread
joannatk marked this conversation as resolved.
Outdated
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.
Expand Down
Loading