Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Change metrics test to work with base_test.py #1688

Merged
merged 7 commits into from
Feb 24, 2023
Merged

Change metrics test to work with base_test.py #1688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
44f1e89
Change Tornado metrics test to work with base_test.py
shalevr Feb 23, 2023
32e940b
Change Urllib metrics test to work with test_base.py
shalevr Feb 23, 2023
2d04bf8
Merge branch 'main' into Change-metrics-tests-to-work-with-test_base
shalevr Feb 23, 2023
7cbdb7d
Change Urllib3 to work with test_base.py
shalevr Feb 23, 2023
dfcedf8
Merge branch 'Change-metrics-tests-to-work-with-test_base' of https:/…
shalevr Feb 23, 2023
5dfbf17
Fix class name, and tornado uninstrument
shalevr Feb 23, 2023
35bfbe0
Merge branch 'main' into Change-metrics-tests-to-work-with-test_base
shalevr Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: d0bb12b34b0c487198c935001636b6163485a50f
CORE_REPO_SHA: 2d1f0b9f5fce62549d1338882f37b91b95881c75

jobs:
build:
Expand Down
238 changes: 91 additions & 147 deletions instrumentation/opentelemetry-instrumentation-tornado/tests/test_metrics_instrumentation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,97 +15,23 @@

from timeit import default_timer

from tornado.testing import AsyncHTTPTestCase

from opentelemetry import trace
from opentelemetry.instrumentation.tornado import TornadoInstrumentor
from opentelemetry.sdk.metrics.export import (
HistogramDataPoint,
NumberDataPoint,
)
from opentelemetry.test.test_base import TestBase

from .tornado_test_app import make_app

from opentelemetry.sdk.metrics.export import HistogramDataPoint

class TornadoTest(AsyncHTTPTestCase, TestBase):
# pylint:disable=no-self-use
def get_app(self):
tracer = trace.get_tracer(__name__)
app = make_app(tracer)
return app

def get_sorted_metrics(self):
resource_metrics = (
self.memory_metrics_reader.get_metrics_data().resource_metrics
)
for metrics in resource_metrics:
for scope_metrics in metrics.scope_metrics:
all_metrics = list(scope_metrics.metrics)
return self.sorted_metrics(all_metrics)

@staticmethod
def sorted_metrics(metrics):
"""
Sorts metrics by metric name.
"""
return sorted(
metrics,
key=lambda m: m.name,
)
from .test_instrumentation import ( # pylint: disable=no-name-in-module,import-error
TornadoTest,
)

def assert_metric_expected(
self, metric, expected_value, expected_attributes
):
data_point = next(iter(metric.data.data_points))

if isinstance(data_point, HistogramDataPoint):
self.assertEqual(
data_point.sum,
expected_value,
)
elif isinstance(data_point, NumberDataPoint):
self.assertEqual(
data_point.value,
expected_value,
class TestTornadoMetricsInstrumentation(TornadoTest):
# Return Sequence with one histogram
def create_histogram_data_points(self, sum_data_point, attributes):
return [
self.create_histogram_data_point(
sum_data_point, 1, sum_data_point, sum_data_point, attributes
)
]

self.assertDictEqual(
expected_attributes,
dict(data_point.attributes),
)

def assert_duration_metric_expected(
self, metric, duration_estimated, expected_attributes
):
data_point = next(iter(metric.data.data_points))

self.assertAlmostEqual(
data_point.sum,
duration_estimated,
delta=200,
)

self.assertDictEqual(
expected_attributes,
dict(data_point.attributes),
)

def setUp(self):
super().setUp()
TornadoInstrumentor().instrument(
server_request_hook=getattr(self, "server_request_hook", None),
client_request_hook=getattr(self, "client_request_hook", None),
client_response_hook=getattr(self, "client_response_hook", None),
meter_provider=self.meter_provider,
)

def tearDown(self):
TornadoInstrumentor().uninstrument()
super().tearDown()


class TestTornadoInstrumentor(TornadoTest):
def test_basic_metrics(self):
start_time = default_timer()
response = self.fetch("/")
Expand All @@ -132,104 +58,122 @@ def test_basic_metrics(self):
)
self.assert_metric_expected(
server_active_request,
0,
{
"http.method": "GET",
"http.flavor": "HTTP/1.1",
"http.scheme": "http",
"http.target": "/",
"http.host": response.request.headers["host"],
},
[
self.create_number_data_point(
0,
attributes={
"http.method": "GET",
"http.flavor": "HTTP/1.1",
"http.scheme": "http",
"http.target": "/",
"http.host": response.request.headers["host"],
},
),
],
)

self.assertEqual(server_duration.name, "http.server.duration")
self.assert_duration_metric_expected(
self.assert_metric_expected(
server_duration,
client_duration_estimated,
{
"http.status_code": response.code,
"http.method": "GET",
"http.flavor": "HTTP/1.1",
"http.scheme": "http",
"http.target": "/",
"http.host": response.request.headers["host"],
},
self.create_histogram_data_points(
client_duration_estimated,
attributes={
"http.method": "GET",
"http.flavor": "HTTP/1.1",
"http.scheme": "http",
"http.target": "/",
"http.host": response.request.headers["host"],
"http.status_code": response.code,
},
),
est_value_delta=200,
)

self.assertEqual(server_request_size.name, "http.server.request.size")
self.assert_metric_expected(
server_request_size,
0,
{
"http.status_code": 200,
"http.method": "GET",
"http.flavor": "HTTP/1.1",
"http.scheme": "http",
"http.target": "/",
"http.host": response.request.headers["host"],
},
self.create_histogram_data_points(
0,
attributes={
"http.status_code": 200,
"http.method": "GET",
"http.flavor": "HTTP/1.1",
"http.scheme": "http",
"http.target": "/",
"http.host": response.request.headers["host"],
},
),
)

self.assertEqual(
server_response_size.name, "http.server.response.size"
)
self.assert_metric_expected(
server_response_size,
len(response.body),
{
"http.status_code": response.code,
"http.method": "GET",
"http.flavor": "HTTP/1.1",
"http.scheme": "http",
"http.target": "/",
"http.host": response.request.headers["host"],
},
self.create_histogram_data_points(
len(response.body),
attributes={
"http.status_code": response.code,
"http.method": "GET",
"http.flavor": "HTTP/1.1",
"http.scheme": "http",
"http.target": "/",
"http.host": response.request.headers["host"],
},
),
)

self.assertEqual(client_duration.name, "http.client.duration")
self.assert_duration_metric_expected(
self.assert_metric_expected(
client_duration,
client_duration_estimated,
{
"http.status_code": response.code,
"http.method": "GET",
"http.url": response.effective_url,
},
self.create_histogram_data_points(
client_duration_estimated,
attributes={
"http.status_code": response.code,
"http.method": "GET",
"http.url": response.effective_url,
},
),
est_value_delta=200,
)

self.assertEqual(client_request_size.name, "http.client.request.size")
self.assert_metric_expected(
client_request_size,
0,
{
"http.status_code": response.code,
"http.method": "GET",
"http.url": response.effective_url,
},
self.create_histogram_data_points(
0,
attributes={
"http.status_code": response.code,
"http.method": "GET",
"http.url": response.effective_url,
},
),
)

self.assertEqual(
client_response_size.name, "http.client.response.size"
)
self.assert_metric_expected(
client_response_size,
len(response.body),
{
"http.status_code": response.code,
"http.method": "GET",
"http.url": response.effective_url,
},
self.create_histogram_data_points(
len(response.body),
attributes={
"http.status_code": response.code,
"http.method": "GET",
"http.url": response.effective_url,
},
),
)

def test_metric_uninstrument(self):
self.fetch("/")
TornadoInstrumentor().uninstrument()
self.fetch("/")

metrics_list = self.memory_metrics_reader.get_metrics_data()
for resource_metric in metrics_list.resource_metrics:
for scope_metric in resource_metric.scope_metrics:
for metric in scope_metric.metrics:
for point in list(metric.data.data_points):
if isinstance(point, HistogramDataPoint):
self.assertEqual(point.count, 1)
metrics = self.get_sorted_metrics()
self.assertEqual(len(metrics), 7)

for metric in metrics:
for point in list(metric.data.data_points):
if isinstance(point, HistogramDataPoint):
self.assertEqual(point.count, 1)
Loading