Merge branch 'main' into issue_547

ocelotl · web-flow · commit 2aceed1baccc · 2021-08-30T22:49:19.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 3e1c89bcae77c34b9750a1f00608a04a97921c51
+  CORE_REPO_SHA: 9dc17e33bc083e38c1fd55b8ed6787caba8f54fe
 
 jobs:
   build:
diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py b/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py
@@ -68,7 +68,7 @@ def test_instrumentor_connect(self):
         span = spans_list[0]
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.aiopg
         )
 
@@ -97,7 +97,7 @@ async def _ctx_manager_connect():
                     span = spans_list[0]
 
                     # Check version and name in span's instrumentation info
-                    self.check_span_instrumentation_info(
+                    self.assertEqualSpanInstrumentationInfo(
                         span, opentelemetry.instrumentation.aiopg
                     )
 
@@ -118,7 +118,7 @@ def test_instrumentor_create_pool(self):
         span = spans_list[0]
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.aiopg
         )
 
@@ -149,7 +149,7 @@ async def _ctx_manager_pool():
                         span = spans_list[0]
 
                         # Check version and name in span's instrumentation info
-                        self.check_span_instrumentation_info(
+                        self.assertEqualSpanInstrumentationInfo(
                             span, opentelemetry.instrumentation.aiopg
                         )
 
diff --git a/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py b/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py
@@ -132,8 +132,8 @@ def test_s3_client(self):
         assert spans
         span = spans[0]
         self.assertEqual(len(spans), 2)
-        self.assertEqual(
-            span.attributes,
+        self.assertSpanHasAttributes(
+            span,
             {
                 "aws.operation": "ListBuckets",
                 "aws.region": "us-west-2",
@@ -150,8 +150,8 @@ def test_s3_client(self):
         spans = self.memory_exporter.get_finished_spans()
         assert spans
         span = spans[2]
-        self.assertEqual(
-            span.attributes,
+        self.assertSpanHasAttributes(
+            span,
             {
                 "aws.operation": "ListObjects",
                 "aws.region": "us-west-2",
@@ -175,9 +175,9 @@ def test_s3_put(self):
         spans = self.memory_exporter.get_finished_spans()
         assert spans
         self.assertEqual(len(spans), 3)
-        create_bucket_attributes = spans[0].attributes
-        self.assertEqual(
-            create_bucket_attributes,
+        create_span = spans[0]
+        self.assertSpanHasAttributes(
+            create_span,
             {
                 "aws.operation": "CreateBucket",
                 "aws.region": "us-west-2",
@@ -186,9 +186,9 @@ def test_s3_put(self):
                 SpanAttributes.HTTP_STATUS_CODE: 200,
             },
         )
-        put_object_attributes = spans[1].attributes
-        self.assertEqual(
-            put_object_attributes,
+        put_span = spans[1]
+        self.assertSpanHasAttributes(
+            put_span,
             {
                 "aws.operation": "PutObject",
                 "aws.region": "us-west-2",
@@ -198,9 +198,9 @@ def test_s3_put(self):
             },
         )
         self.assertTrue("params.Body" not in spans[1].attributes.keys())
-        get_object_attributes = spans[2].attributes
-        self.assertEqual(
-            get_object_attributes,
+        get_span = spans[2]
+        self.assertSpanHasAttributes(
+            get_span,
             {
                 "aws.operation": "GetObject",
                 "aws.region": "us-west-2",
diff --git a/instrumentation/opentelemetry-instrumentation-celery/tests/test_tasks.py b/instrumentation/opentelemetry-instrumentation-celery/tests/test_tasks.py
@@ -50,7 +50,7 @@ def test_task(self):
 
         self.assertEqual(consumer.name, "run/tests.celery_test_tasks.task_add")
         self.assertEqual(consumer.kind, SpanKind.CONSUMER)
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             consumer,
             {
                 "celery.action": "run",
@@ -64,7 +64,7 @@ def test_task(self):
             producer.name, "apply_async/tests.celery_test_tasks.task_add"
         )
         self.assertEqual(producer.kind, SpanKind.PRODUCER)
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             producer,
             {
                 "celery.action": "apply_async",
diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py
@@ -77,8 +77,8 @@ def test_instrumentor(self, request_mock):
         span = spans_list[0]
 
         # Check version and name in span's instrumentation info
-        # self.check_span_instrumentation_info(span, opentelemetry.instrumentation.elasticsearch)
-        self.check_span_instrumentation_info(
+        # self.assertEqualSpanInstrumentationInfo(span, opentelemetry.instrumentation.elasticsearch)
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.elasticsearch
         )
 
@@ -289,7 +289,7 @@ def test_dsl_create(self, request_mock):
             "elasticsearch.url": "/test-index",
             "elasticsearch.method": "PUT",
         }
-        self.assert_span_has_attributes(span2, attributes)
+        self.assertSpanHasAttributes(span2, attributes)
         self.assertEqual(
             literal_eval(span2.attributes[SpanAttributes.DB_STATEMENT]),
             helpers.dsl_create_statement,
@@ -315,7 +315,7 @@ def test_dsl_index(self, request_mock):
             "elasticsearch.url": helpers.dsl_index_url,
             "elasticsearch.method": "PUT",
         }
-        self.assert_span_has_attributes(span, attributes)
+        self.assertSpanHasAttributes(span, attributes)
         self.assertEqual(
             literal_eval(span.attributes[SpanAttributes.DB_STATEMENT]),
             {
diff --git a/instrumentation/opentelemetry-instrumentation-falcon/tests/test_falcon.py b/instrumentation/opentelemetry-instrumentation-falcon/tests/test_falcon.py
@@ -103,7 +103,7 @@ def _test_method(self, method):
             span.name, "HelloWorldResource.on_{0}".format(method.lower())
         )
         self.assertEqual(span.status.status_code, StatusCode.UNSET)
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.HTTP_METHOD: method,
@@ -128,7 +128,7 @@ def test_404(self):
         span = spans[0]
         self.assertEqual(span.name, "HTTP GET")
         self.assertEqual(span.status.status_code, StatusCode.ERROR)
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.HTTP_METHOD: "GET",
@@ -159,7 +159,7 @@ def test_500(self):
             span.status.description,
             "NameError: name 'non_existent_var' is not defined",
         )
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.HTTP_METHOD: "GET",
diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py b/instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py
@@ -222,7 +222,7 @@ def client_response_hook(send_span, response):
         response_spans = spans[:2]
         for span in response_spans:
             self.assertEqual(span.name, "name from response hook")
-            self.assert_span_has_attributes(
+            self.assertSpanHasAttributes(
                 span, {"attr-from-response-hook": "value"}
             )
 
diff --git a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py
@@ -112,7 +112,7 @@ def test_unary_unary_future(self):
         self.assertIs(span.kind, trace.SpanKind.CLIENT)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.grpc
         )
 
@@ -126,11 +126,11 @@ def test_unary_unary(self):
         self.assertIs(span.kind, trace.SpanKind.CLIENT)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.grpc
         )
 
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.RPC_METHOD: "SimpleMethod",
@@ -152,11 +152,11 @@ def test_unary_stream(self):
         self.assertIs(span.kind, trace.SpanKind.CLIENT)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.grpc
         )
 
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.RPC_METHOD: "ServerStreamingMethod",
@@ -178,11 +178,11 @@ def test_stream_unary(self):
         self.assertIs(span.kind, trace.SpanKind.CLIENT)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.grpc
         )
 
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.RPC_METHOD: "ClientStreamingMethod",
@@ -206,11 +206,11 @@ def test_stream_stream(self):
         self.assertIs(span.kind, trace.SpanKind.CLIENT)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.grpc
         )
 
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.RPC_METHOD: "BidirectionalStreamingMethod",
diff --git a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py
@@ -106,12 +106,12 @@ def handler(request, context):
             self.assertIs(span.kind, trace.SpanKind.SERVER)
 
             # Check version and name in span's instrumentation info
-            self.check_span_instrumentation_info(
+            self.assertEqualSpanInstrumentationInfo(
                 span, opentelemetry.instrumentation.grpc
             )
 
             # Check attributes
-            self.assert_span_has_attributes(
+            self.assertSpanHasAttributes(
                 span,
                 {
                     SpanAttributes.NET_PEER_IP: "[::1]",
@@ -187,12 +187,12 @@ def test_create_span(self):
         self.assertIs(span.kind, trace.SpanKind.SERVER)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.grpc
         )
 
         # Check attributes
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.NET_PEER_IP: "[::1]",
@@ -257,12 +257,12 @@ def SimpleMethod(self, request, context):
         self.assertIs(parent_span.kind, trace.SpanKind.SERVER)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             parent_span, opentelemetry.instrumentation.grpc
         )
 
         # Check attributes
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             parent_span,
             {
                 SpanAttributes.NET_PEER_IP: "[::1]",
@@ -317,12 +317,12 @@ def test_create_span_streaming(self):
         self.assertIs(span.kind, trace.SpanKind.SERVER)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.grpc
         )
 
         # Check attributes
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.NET_PEER_IP: "[::1]",
@@ -386,12 +386,12 @@ def ServerStreamingMethod(self, request, context):
         self.assertIs(parent_span.kind, trace.SpanKind.SERVER)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             parent_span, opentelemetry.instrumentation.grpc
         )
 
         # Check attributes
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             parent_span,
             {
                 SpanAttributes.NET_PEER_IP: "[::1]",
@@ -490,7 +490,7 @@ def handler(request, context):
             self.assertIsNone(span2.parent)
 
             # check attributes
-            self.assert_span_has_attributes(
+            self.assertSpanHasAttributes(
                 span,
                 {
                     SpanAttributes.NET_PEER_IP: "[::1]",
@@ -562,7 +562,7 @@ def handler(request, context):
             self.assertIsNone(span2.parent)
 
             # check attributes
-            self.assert_span_has_attributes(
+            self.assertSpanHasAttributes(
                 span,
                 {
                     SpanAttributes.NET_PEER_IP: "[::1]",
@@ -617,7 +617,7 @@ def handler(request, context):
         self.assertIs(span.kind, trace.SpanKind.SERVER)
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.grpc
         )
 
@@ -631,7 +631,7 @@ def handler(request, context):
         )
 
         # Check attributes
-        self.assert_span_has_attributes(
+        self.assertSpanHasAttributes(
             span,
             {
                 SpanAttributes.NET_PEER_IP: "[::1]",
diff --git a/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py b/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py
@@ -153,7 +153,7 @@ def test_basic(self):
 
             self.assertIs(span.status.status_code, trace.StatusCode.UNSET)
 
-            self.check_span_instrumentation_info(
+            self.assertEqualSpanInstrumentationInfo(
                 span, opentelemetry.instrumentation.httpx
             )
 
diff --git a/instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py b/instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py
@@ -43,7 +43,7 @@ def test_instrumentor(self, mock_connect):
         span = spans_list[0]
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.mysql
         )
 
diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py b/instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py
@@ -100,7 +100,7 @@ def test_instrumentor(self):
         span = spans_list[0]
 
         # Check version and name in span's instrumentation info
-        self.check_span_instrumentation_info(
+        self.assertEqualSpanInstrumentationInfo(
             span, opentelemetry.instrumentation.psycopg2
         )
 
diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py b/instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py
diff --git a/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py b/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py
diff --git a/instrumentation/opentelemetry-instrumentation-starlette/tests/test_starlette_instrumentation.py b/instrumentation/opentelemetry-instrumentation-starlette/tests/test_starlette_instrumentation.py
diff --git a/instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py b/instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py
diff --git a/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py b/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ def test_task(self):`
`50`	`50`
`51`	`51`	`self.assertEqual(consumer.name, "run/tests.celery_test_tasks.task_add")`
`52`	`52`	`self.assertEqual(consumer.kind, SpanKind.CONSUMER)`
`53`		`- self.assert_span_has_attributes(`
	`53`	`+ self.assertSpanHasAttributes(`
`54`	`54`	`consumer,`
`55`	`55`	`{`
`56`	`56`	`"celery.action": "run",`
`@@ -64,7 +64,7 @@ def test_task(self):`
`64`	`64`	`producer.name, "apply_async/tests.celery_test_tasks.task_add"`
`65`	`65`	`)`
`66`	`66`	`self.assertEqual(producer.kind, SpanKind.PRODUCER)`
`67`		`- self.assert_span_has_attributes(`
	`67`	`+ self.assertSpanHasAttributes(`
`68`	`68`	`producer,`
`69`	`69`	`{`
`70`	`70`	`"celery.action": "apply_async",`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ def _test_method(self, method):`
`103`	`103`	`span.name, "HelloWorldResource.on_{0}".format(method.lower())`
`104`	`104`	`)`
`105`	`105`	`self.assertEqual(span.status.status_code, StatusCode.UNSET)`
`106`		`- self.assert_span_has_attributes(`
	`106`	`+ self.assertSpanHasAttributes(`
`107`	`107`	`span,`
`108`	`108`	`{`
`109`	`109`	`SpanAttributes.HTTP_METHOD: method,`
`@@ -128,7 +128,7 @@ def test_404(self):`
`128`	`128`	`span = spans[0]`
`129`	`129`	`self.assertEqual(span.name, "HTTP GET")`
`130`	`130`	`self.assertEqual(span.status.status_code, StatusCode.ERROR)`
`131`		`- self.assert_span_has_attributes(`
	`131`	`+ self.assertSpanHasAttributes(`
`132`	`132`	`span,`
`133`	`133`	`{`
`134`	`134`	`SpanAttributes.HTTP_METHOD: "GET",`
`@@ -159,7 +159,7 @@ def test_500(self):`
`159`	`159`	`span.status.description,`
`160`	`160`	`"NameError: name 'non_existent_var' is not defined",`
`161`	`161`	`)`
`162`		`- self.assert_span_has_attributes(`
	`162`	`+ self.assertSpanHasAttributes(`
`163`	`163`	`span,`
`164`	`164`	`{`
`165`	`165`	`SpanAttributes.HTTP_METHOD: "GET",`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ def client_response_hook(send_span, response):`
`222`	`222`	`response_spans = spans[:2]`
`223`	`223`	`for span in response_spans:`
`224`	`224`	`self.assertEqual(span.name, "name from response hook")`
`225`		`- self.assert_span_has_attributes(`
	`225`	`+ self.assertSpanHasAttributes(`
`226`	`226`	`span, {"attr-from-response-hook": "value"}`
`227`	`227`	`)`
`228`	`228`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ def test_basic(self):`
`153`	`153`
`154`	`154`	`self.assertIs(span.status.status_code, trace.StatusCode.UNSET)`
`155`	`155`
`156`		`- self.check_span_instrumentation_info(`
	`156`	`+ self.assertEqualSpanInstrumentationInfo(`
`157`	`157`	`span, opentelemetry.instrumentation.httpx`
`158`	`158`	`)`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ def test_instrumentor(self, mock_connect):`
`43`	`43`	`span = spans_list[0]`
`44`	`44`
`45`	`45`	`# Check version and name in span's instrumentation info`
`46`		`- self.check_span_instrumentation_info(`
	`46`	`+ self.assertEqualSpanInstrumentationInfo(`
`47`	`47`	`span, opentelemetry.instrumentation.mysql`
`48`	`48`	`)`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ def test_instrumentor(self):`
`100`	`100`	`span = spans_list[0]`
`101`	`101`
`102`	`102`	`# Check version and name in span's instrumentation info`
`103`		`- self.check_span_instrumentation_info(`
	`103`	`+ self.assertEqualSpanInstrumentationInfo(`
`104`	`104`	`span, opentelemetry.instrumentation.psycopg2`
`105`	`105`	`)`
`106`	`106`