Skip to content

Commit

Permalink
Merge pull request #111 from NathanielRN/move-instrumentation-pymemcache
Browse files Browse the repository at this point in the history
Move instrumentation pymemcache
  • Loading branch information
alrex committed Nov 2, 2020
2 parents aa020bb + b244739 commit 39223e3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 0.15.dev0
opentelemetry-instrumentation == 0.15.dev0
opentelemetry-api == 0.15b0
opentelemetry-instrumentation == 0.15b0
pymemcache ~= 1.3
wrapt >= 1.0.0, < 2.0.0

[options.extras_require]
test =
opentelemetry-test == 0.15.dev0
opentelemetry-test == 0.15b0

[options.packages.find]
where = src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.15.dev0"
__version__ = "0.15b0"
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from opentelemetry.instrumentation.pymemcache import PymemcacheInstrumentor
from opentelemetry.test.test_base import TestBase
from opentelemetry.trace import get_tracer
from opentelemetry.trace.status import StatusCanonicalCode

from .utils import MockSocket, _str

Expand Down Expand Up @@ -278,7 +277,7 @@ def _delete():

span = spans[0]

self.assertNotEqual(span.status.canonical_code, StatusCanonicalCode.OK)
self.assertFalse(span.status.is_ok)

self.check_spans(spans, 1, ["delete key"])

Expand All @@ -304,7 +303,7 @@ def _incr():

span = spans[0]

self.assertNotEqual(span.status.canonical_code, StatusCanonicalCode.OK)
self.assertFalse(span.status.is_ok)

self.check_spans(spans, 1, ["incr key"])

Expand All @@ -321,7 +320,7 @@ def _get():

span = spans[0]

self.assertNotEqual(span.status.canonical_code, StatusCanonicalCode.OK)
self.assertFalse(span.status.is_ok)

self.check_spans(spans, 1, ["get key"])

Expand All @@ -338,7 +337,7 @@ def _get():

span = spans[0]

self.assertNotEqual(span.status.canonical_code, StatusCanonicalCode.OK)
self.assertFalse(span.status.is_ok)

self.check_spans(spans, 1, ["get key"])

Expand Down Expand Up @@ -373,7 +372,7 @@ def _set():

span = spans[0]

self.assertNotEqual(span.status.canonical_code, StatusCanonicalCode.OK)
self.assertFalse(span.status.is_ok)

self.check_spans(spans, 1, ["set key"])

Expand All @@ -390,7 +389,7 @@ def _set():

span = spans[0]

self.assertNotEqual(span.status.canonical_code, StatusCanonicalCode.OK)
self.assertFalse(span.status.is_ok)

self.check_spans(spans, 1, ["set key"])

Expand All @@ -407,7 +406,7 @@ def _set():

span = spans[0]

self.assertNotEqual(span.status.canonical_code, StatusCanonicalCode.OK)
self.assertFalse(span.status.is_ok)

self.check_spans(spans, 1, ["set key has space"])

Expand Down

0 comments on commit 39223e3

Please sign in to comment.