Skip to content

Redis: Validate min version before instrumenting #174

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
merged 3 commits into from
Jun 25, 2019
Merged

Redis: Validate min version before instrumenting #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3147caa
Validate min redis version before instrumenting
pglombardo Jun 24, 2019
647e906
Make sure not to send empty trace payloads
pglombardo Jun 24, 2019
ee0e784
Code comment
pglombardo Jun 25, 2019
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
5 changes: 5 additions & 0 deletions instana/agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@ def report_traces(self, spans):
Used to report entity data (metrics & snapshot) to the host agent.
"""
try:
# Concurrency double check: Don't report if we don't have
# any spans
if len(spans) == 0:
return 0

response = None
response = self.client.post(self.__traces_url(),
data=self.to_json(spans),
Expand Down
5 changes: 3 additions & 2 deletions instana/instrumentation/redis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
try:
import redis

if redis.VERSION < (3, 0, 0):
if ((redis.VERSION >= (2, 10, 6)) and (redis.VERSION < (3, 0, 0))):

@wrapt.patch_function_wrapper('redis.client','StrictRedis.execute_command')
def execute_command_with_instana(wrapped, instance, args, kwargs):
Expand Down Expand Up @@ -76,6 +76,7 @@ def execute_with_instana(wrapped, instance, args, kwargs):

logger.debug("Instrumenting redis")
else:
logger.debug("redis >=3.0.0 not supported (yet)")
logger.debug("redis <= 2.10.5 >=3.0.0 not supported.")
logger.debug(" --> https://docs.instana.io/ecosystem/python/supported-versions/#tracing")
except ImportError:
pass