Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
satella
Manage
Activity
Members
Labels
Plan
Issues
1
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
public
satella
Commits
3c5ee443
Commit
3c5ee443
authored
4 years ago
by
Piotr Maślanka
Browse files
Options
Downloads
Patches
Plain Diff
conciser code
parent
da39a316
No related branches found
Branches containing commit
Tags
v2.3.11
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
satella/instrumentation/metrics/json.py
+11
-17
11 additions, 17 deletions
satella/instrumentation/metrics/json.py
with
11 additions
and
17 deletions
satella/instrumentation/metrics/json.py
+
11
−
17
View file @
3c5ee443
...
...
@@ -8,15 +8,18 @@ from satella.coding import for_argument
logger
=
logging
.
getLogger
(
__name__
)
@for_argument
(
copy
.
copy
,
copy
.
copy
)
def
are_equal
(
tree1
,
tree2
)
->
bool
:
tree1
.
pop
(
'
_
'
,
None
)
tree2
.
pop
(
'
_
'
,
None
)
tree1
.
pop
(
'
_timestamp
'
,
None
)
tree2
.
pop
(
'
_timestamp
'
,
None
)
def
get_labels_for_node
(
tree
):
output
=
{}
for
k
,
v
in
tree
.
items
():
if
k
in
(
'
_
'
,
'
_timestamp
'
):
continue
if
not
isinstance
(
v
,
(
list
,
dict
,
tuple
)):
output
[
k
]
=
v
return
output
tree1
=
get_labels_for_node
(
tree1
)
tree2
=
get_labels_for_node
(
tree2
)
@for_argument
(
get_labels_for_node
,
get_labels_for_node
)
def
are_equal
(
tree1
,
tree2
)
->
bool
:
return
tree1
==
tree2
...
...
@@ -94,12 +97,3 @@ def update(tree1, tree2):
return
return_tree
def
get_labels_for_node
(
tree
):
output
=
{}
for
k
,
v
in
tree
.
items
():
if
k
in
(
'
_
'
,
'
_timestamp
'
):
continue
if
not
isinstance
(
v
,
(
list
,
dict
,
tuple
)):
output
[
k
]
=
v
return
output
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment