opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-08-01 06:33:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure resources are not mutated (#310)

Browse Source
This commit is contained in:
alrex
2021-02-08 10:54:13 -08:00
committed by GitHub
parent c265e2f035
commit 7bd1d904b2
3 changed files with 21 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#308](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/308))
- Remove metrics from all instrumentations
([#312](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/312))
- `opentelemetry-instrumentation-boto` updated to set span attributes instead of overriding the resource.
([#310](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/310))
## [0.17b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.17b0) - 2021-01-20

12
instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py
View File

@ -120,18 +120,10 @@ class BotoInstrumentor(BaseInstrumentor):
with self._tracer.start_as_current_span(
"{}.command".format(endpoint_name), kind=SpanKind.CONSUMER,
) as span:
span.set_attribute("endpoint", endpoint_name)
if args:
http_method = args[0]
span.resource = Resource(
attributes={
"endpoint": endpoint_name,
"http_method": http_method.lower(),
}
)
else:
span.resource = Resource(
attributes={"endpoint": endpoint_name}
)
span.set_attribute("http_method", http_method.lower())
# Original func returns a boto.connection.HTTPResponse object
result = original_func(*args, **kwargs)

60
instrumentation/opentelemetry-instrumentation-boto/tests/test_boto_instrumentation.py
View File

@ -28,7 +28,6 @@ from moto import ( # pylint: disable=import-error
)
from opentelemetry.instrumentation.boto import BotoInstrumentor
from opentelemetry.sdk.resources import Resource
from opentelemetry.test.test_base import TestBase
@ -71,12 +70,8 @@ class TestBotoInstrumentor(TestBase):
span = spans[1]
self.assertEqual(span.attributes["aws.operation"], "RunInstances")
assert_span_http_status_code(span, 200)
self.assertEqual(
span.resource,
Resource(
attributes={"endpoint": "ec2", "http_method": "runinstances"}
),
)
self.assertEqual(span.attributes["endpoint"], "ec2")
self.assertEqual(span.attributes["http_method"], "runinstances")
self.assertEqual(span.attributes["http.method"], "POST")
self.assertEqual(span.attributes["aws.region"], "us-west-2")
self.assertEqual(span.name, "ec2.command")
@ -147,10 +142,8 @@ class TestBotoInstrumentor(TestBase):
self.assertEqual(len(spans), 3)
span = spans[2]
assert_span_http_status_code(span, 200)
self.assertEqual(
span.resource,
Resource(attributes={"endpoint": "s3", "http_method": "head"}),
)
self.assertEqual(span.attributes["endpoint"], "s3")
self.assertEqual(span.attributes["http_method"], "head")
self.assertEqual(span.attributes["http.method"], "HEAD")
self.assertEqual(span.attributes["aws.operation"], "head_bucket")
self.assertEqual(span.name, "s3.command")
@ -162,10 +155,8 @@ class TestBotoInstrumentor(TestBase):
spans = self.memory_exporter.get_finished_spans()
assert spans
span = spans[2]
self.assertEqual(
span.resource,
Resource(attributes={"endpoint": "s3", "http_method": "head"}),
)
self.assertEqual(spans[2].attributes["endpoint"], "s3")
self.assertEqual(spans[2].attributes["http_method"], "head")
@mock_s3_deprecated
def test_s3_put(self):
@ -182,24 +173,18 @@ class TestBotoInstrumentor(TestBase):
self.assertEqual(len(spans), 3)
self.assertEqual(spans[0].attributes["aws.operation"], "create_bucket")
assert_span_http_status_code(spans[0], 200)
self.assertEqual(
spans[0].resource,
Resource(attributes={"endpoint": "s3", "http_method": "put"}),
)
self.assertEqual(spans[0].attributes["endpoint"], "s3")
self.assertEqual(spans[0].attributes["http_method"], "put")
# get bucket
self.assertEqual(spans[1].attributes["aws.operation"], "head_bucket")
self.assertEqual(
spans[1].resource,
Resource(attributes={"endpoint": "s3", "http_method": "head"}),
)
self.assertEqual(spans[1].attributes["endpoint"], "s3")
self.assertEqual(spans[1].attributes["http_method"], "head")
# put object
self.assertEqual(
spans[2].attributes["aws.operation"], "_send_file_internal"
)
self.assertEqual(
spans[2].resource,
Resource(attributes={"endpoint": "s3", "http_method": "put"}),
)
self.assertEqual(spans[2].attributes["endpoint"], "s3")
self.assertEqual(spans[2].attributes["http_method"], "put")
@mock_lambda_deprecated
def test_unpatch(self):
@ -239,10 +224,8 @@ class TestBotoInstrumentor(TestBase):
self.assertEqual(len(spans), 2)
span = spans[0]
assert_span_http_status_code(span, 200)
self.assertEqual(
span.resource,
Resource(attributes={"endpoint": "lambda", "http_method": "get"}),
)
self.assertEqual(span.attributes["endpoint"], "lambda")
self.assertEqual(span.attributes["http_method"], "get")
self.assertEqual(span.attributes["http.method"], "GET")
self.assertEqual(span.attributes["aws.region"], "us-east-2")
self.assertEqual(span.attributes["aws.operation"], "list_functions")
@ -256,15 +239,8 @@ class TestBotoInstrumentor(TestBase):
spans = self.memory_exporter.get_finished_spans()
assert spans
span = spans[0]
self.assertEqual(
span.resource,
Resource(
attributes={
"endpoint": "sts",
"http_method": "getfederationtoken",
}
),
)
self.assertEqual(span.attributes["endpoint"], "sts")
self.assertEqual(span.attributes["http_method"], "getfederationtoken")
self.assertEqual(span.attributes["aws.region"], "us-west-2")
self.assertEqual(
span.attributes["aws.operation"], "GetFederationToken"
@ -288,7 +264,5 @@ class TestBotoInstrumentor(TestBase):
spans = self.memory_exporter.get_finished_spans()
assert spans
span = spans[0]
self.assertEqual(
span.resource, Resource(attributes={"endpoint": "elasticcache"})
)
self.assertEqual(span.attributes["endpoint"], "elasticcache")
self.assertEqual(span.attributes["aws.region"], "us-west-2")