-
Notifications
You must be signed in to change notification settings - Fork 609
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.
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
Adding the Resource API #61
Merged
toumorokoshi
merged 6 commits into
open-telemetry:master
from
toumorokoshi:resources-api
Jul 29, 2019
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0554ec3
Adding the Resource API
toumorokoshi e16e854
Resource API: unit test on empty string precedence
toumorokoshi b95da6a
Moving Resource to API and SDK
toumorokoshi 8beab78
Resource API: renaming DefaultResource to Resource
toumorokoshi 389dde8
adding missing newline (lint error)
toumorokoshi 3c363c6
Fixing imports to adhere with isort
toumorokoshi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
# Copyright 2019, OpenTelemetry Authors | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
import opentelemetry.resources as resources | ||
|
||
|
||
class Resource(resources.Resource): | ||
def __init__(self, labels): | ||
self._labels = labels | ||
|
||
@staticmethod | ||
def create(labels): | ||
return Resource(labels) | ||
|
||
@property | ||
def labels(self): | ||
return self._labels | ||
|
||
def merge(self, other): | ||
if other is None: | ||
return self | ||
if not self._labels: | ||
return other | ||
merged_labels = self.labels.copy() | ||
for key, value in other.labels.items(): | ||
if key not in merged_labels or merged_labels[key] == "": | ||
merged_labels[key] = value | ||
return Resource(merged_labels) | ||
|
||
def __eq__(self, other: object) -> bool: | ||
if not isinstance(other, Resource): | ||
return False | ||
return self.labels == other.labels |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
import unittest | ||
from opentelemetry.sdk import resources | ||
|
||
|
||
class TestResources(unittest.TestCase): | ||
def test_resource_merge(self): | ||
left = resources.Resource({"service": "ui"}) | ||
right = resources.Resource({"host": "service-host"}) | ||
self.assertEqual( | ||
left.merge(right), | ||
resources.Resource({ | ||
"service": "ui", | ||
"host": "service-host" | ||
})) | ||
|
||
def test_resource_merge_empty_string(self): | ||
"""Verify Resource.merge behavior with the empty string. | ||
|
||
Labels from the source Resource take precedence, with | ||
the exception of the empty string. | ||
|
||
""" | ||
left = resources.Resource({"service": "ui", "host": ""}) | ||
right = resources.Resource({ | ||
"host": "service-host", | ||
"service": "not-ui" | ||
}) | ||
self.assertEqual( | ||
left.merge(right), | ||
resources.Resource({ | ||
"service": "ui", | ||
"host": "service-host" | ||
})) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No blank lines here? I'm surprised lint doesn't complain about this one either.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will add blank lines