Skip to content

More resilient snapshot collection #55

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 1 commit into from
Jan 19, 2018
Merged

More resilient snapshot collection #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 23 additions & 25 deletions instana/meter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,24 +160,19 @@ def collect_snapshot(self):
else:
appname = os.path.basename(sys.argv[0])

s = Snapshot(name=appname,
version=sys.version,
rlimit_core=resource.getrlimit(resource.RLIMIT_CORE),
rlimit_cpu=resource.getrlimit(resource.RLIMIT_CPU),
rlimit_fsize=resource.getrlimit(
resource.RLIMIT_FSIZE),
rlimit_data=resource.getrlimit(resource.RLIMIT_DATA),
rlimit_stack=resource.getrlimit(
resource.RLIMIT_STACK),
rlimit_rss=resource.getrlimit(resource.RLIMIT_RSS),
rlimit_nproc=resource.getrlimit(
resource.RLIMIT_NPROC),
rlimit_nofile=resource.getrlimit(
resource.RLIMIT_NOFILE),
rlimit_memlock=resource.getrlimit(
resource.RLIMIT_MEMLOCK),
rlimit_as=resource.getrlimit(resource.RLIMIT_AS),
versions=self.collect_modules())
s = Snapshot(name=appname, version=sys.version)
s.version = sys.version
s.rlimit_core = resource.getrlimit(resource.RLIMIT_CORE)
s.rlimit_cpu = resource.getrlimit(resource.RLIMIT_CPU)
s.rlimit_fsize = resource.getrlimit(resource.RLIMIT_FSIZE)
s.rlimit_data = resource.getrlimit(resource.RLIMIT_DATA)
s.rlimit_stack = resource.getrlimit(resource.RLIMIT_STACK)
s.rlimit_rss = resource.getrlimit(resource.RLIMIT_RSS)
s.rlimit_nproc = resource.getrlimit(resource.RLIMIT_NPROC)
s.rlimit_nofile = resource.getrlimit(resource.RLIMIT_NOFILE)
s.rlimit_memlock = resource.getrlimit(resource.RLIMIT_MEMLOCK)
s.rlimit_as = resource.getrlimit(resource.RLIMIT_AS)
s.versions = self.collect_modules()

return s
except Exception as e:
Expand All @@ -186,13 +181,16 @@ def collect_snapshot(self):
return None

def jsonable(self, value):
if callable(value):
result = value()
elif type(value) is ModuleType:
result = str(value)
else:
result = value
return result
try:
if callable(value):
result = value()
elif type(value) is ModuleType:
result = value
else:
result = value
return str(result)
except Exception as e:
log.debug(e)

def collect_modules(self):
try:
Expand Down