Skip to content

Commit f025e3e

Browse files
committed
ran format
1 parent e2a4190 commit f025e3e

8 files changed

Lines changed: 43 additions & 49 deletions

File tree

packages/google-cloud-bigtable/google/cloud/bigtable/data/_async/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
)
7171
from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
7272
BigtableMetricsExporter,
73-
GoogleCloudMetricsHandler
73+
GoogleCloudMetricsHandler,
7474
)
7575
from google.cloud.bigtable.data.exceptions import (
7676
FailedQueryShardError,

packages/google-cloud-bigtable/google/cloud/bigtable/data/_metrics/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
15-
OpenTelemetryMetricsHandler,
16-
)
17-
from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
18-
GoogleCloudMetricsHandler,
19-
)
2014
from google.cloud.bigtable.data._metrics.data_model import (
2115
ActiveAttemptMetric,
2216
ActiveOperationMetric,
@@ -25,6 +19,12 @@
2519
OperationState,
2620
OperationType,
2721
)
22+
from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
23+
GoogleCloudMetricsHandler,
24+
)
25+
from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
26+
OpenTelemetryMetricsHandler,
27+
)
2828
from google.cloud.bigtable.data._metrics.metrics_controller import (
2929
BigtableClientSideMetricsController,
3030
)

packages/google-cloud-bigtable/google/cloud/bigtable/data/_metrics/handlers/gcp_exporter.py

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,10 @@
1616

1717
import time
1818

19-
from opentelemetry.sdk.metrics import MeterProvider
20-
from opentelemetry.sdk.metrics import view
21-
from opentelemetry.sdk.metrics.export import (
22-
HistogramDataPoint,
23-
MetricExporter,
24-
MetricExportResult,
25-
MetricsData,
26-
NumberDataPoint,
27-
PeriodicExportingMetricReader,
28-
)
29-
from google.protobuf.timestamp_pb2 import Timestamp
3019
from google.api.distribution_pb2 import Distribution
3120
from google.api.metric_pb2 import Metric as GMetric
32-
from google.api.monitored_resource_pb2 import MonitoredResource
3321
from google.api.metric_pb2 import MetricDescriptor
22+
from google.api.monitored_resource_pb2 import MonitoredResource
3423
from google.api_core import gapic_v1
3524
from google.cloud.monitoring_v3 import (
3625
CreateTimeSeriesRequest,
@@ -40,15 +29,22 @@
4029
TimeSeries,
4130
TypedValue,
4231
)
32+
from google.protobuf.timestamp_pb2 import Timestamp
33+
from opentelemetry.sdk.metrics import MeterProvider, view
34+
from opentelemetry.sdk.metrics.export import (
35+
HistogramDataPoint,
36+
MetricExporter,
37+
MetricExportResult,
38+
MetricsData,
39+
NumberDataPoint,
40+
PeriodicExportingMetricReader,
41+
)
4342

4443
from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
4544
OpenTelemetryMetricsHandler,
46-
)
47-
from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
4845
_OpenTelemetryInstruments,
4946
)
5047

51-
5248
# create OpenTelemetry views for Bigtable metrics
5349
# avoid reformatting into individual lines
5450
# fmt: off

packages/google-cloud-bigtable/google/cloud/bigtable/data/_metrics/handlers/opentelemetry.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
import uuid
1919

2020
from google.cloud.bigtable import __version__ as bigtable_version
21+
from google.cloud.bigtable.data._metrics.data_model import (
22+
DEFAULT_CLUSTER_ID,
23+
DEFAULT_ZONE,
24+
ActiveOperationMetric,
25+
CompletedAttemptMetric,
26+
CompletedOperationMetric,
27+
OperationType,
28+
)
2129
from google.cloud.bigtable.data._metrics.handlers._base import MetricsHandler
22-
from google.cloud.bigtable.data._metrics.data_model import OperationType
23-
from google.cloud.bigtable.data._metrics.data_model import DEFAULT_CLUSTER_ID
24-
from google.cloud.bigtable.data._metrics.data_model import DEFAULT_ZONE
25-
from google.cloud.bigtable.data._metrics.data_model import ActiveOperationMetric
26-
from google.cloud.bigtable.data._metrics.data_model import CompletedAttemptMetric
27-
from google.cloud.bigtable.data._metrics.data_model import CompletedOperationMetric
2830

2931
# conversion factor for converting from nanoseconds to milliseconds
3032
NS_TO_MS = 1e6
@@ -216,9 +218,7 @@ def on_attempt_complete(
216218
{"streaming": is_streaming, "status": status, **labels},
217219
)
218220
flow_throttling = (
219-
op.flow_throttling_time_ns / NS_TO_MS
220-
if op.flow_throttling_time_ns
221-
else 0
221+
op.flow_throttling_time_ns / NS_TO_MS if op.flow_throttling_time_ns else 0
222222
)
223223
self.otel.throttling_latencies.record(flow_throttling, labels)
224224
self.otel.application_latencies.record(

packages/google-cloud-bigtable/tests/system/data/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16+
import datetime
1617
import os
1718
import uuid
18-
import datetime
1919

2020
import pytest
2121

packages/google-cloud-bigtable/tests/unit/data/_async/test_client.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ async def test_ctor(self):
115115
from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
116116
BigtableMetricsExporter,
117117
)
118+
118119
expected_project = "project-id"
119120
expected_credentials = AnonymousCredentials()
120121
client = self._make_client(
@@ -1210,8 +1211,8 @@ async def test_ctor(self):
12101211
from google.cloud.bigtable.data._helpers import _WarmedInstanceKey
12111212
from google.cloud.bigtable.data._metrics import (
12121213
BigtableClientSideMetricsController,
1214+
GoogleCloudMetricsHandler,
12131215
)
1214-
from google.cloud.bigtable.data._metrics import GoogleCloudMetricsHandler
12151216

12161217
expected_table_id = "table-id"
12171218
expected_instance_id = "instance-id"
@@ -1665,6 +1666,7 @@ def _make_table(self, *args, **kwargs):
16651666
from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
16661667
BigtableMetricsExporter,
16671668
)
1669+
16681670
client_mock = mock.Mock()
16691671
client_mock._register_instance.side_effect = (
16701672
lambda *args, **kwargs: CrossSync.yield_to_event_loop()

packages/google-cloud-bigtable/tests/unit/data/_metrics/test_gcp_exporter_handler.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,28 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
import pytest
1514
import mock
16-
15+
import pytest
16+
from google.api.distribution_pb2 import Distribution
17+
from google.cloud.monitoring_v3 import (
18+
Point,
19+
TimeSeries,
20+
)
1721
from opentelemetry.sdk.metrics import MeterProvider
1822
from opentelemetry.sdk.metrics.export import (
19-
NumberDataPoint,
23+
AggregationTemporality,
2024
HistogramDataPoint,
25+
Metric,
2126
MetricExportResult,
2227
MetricsData,
28+
NumberDataPoint,
2329
ResourceMetrics,
2430
ScopeMetrics,
25-
Metric,
2631
Sum,
27-
AggregationTemporality,
28-
)
29-
from google.cloud.monitoring_v3 import (
30-
Point,
31-
TimeSeries,
3232
)
33-
from google.api.distribution_pb2 import Distribution
34-
3533

3634
from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
3735
BigtableMetricsExporter,
38-
)
39-
from google.cloud.bigtable.data._metrics.handlers.gcp_exporter import (
4036
GoogleCloudMetricsHandler,
4137
)
4238
from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
@@ -284,6 +280,7 @@ def test__batch_write(
284280
def test__batch_write_with_deadline(self):
285281
"""Test that _batch_write passes deadlines to gapic correctly."""
286282
import time
283+
287284
from google.api_core import gapic_v1
288285

289286
instance = self._make_one("project")

packages/google-cloud-bigtable/tests/unit/data/_metrics/test_opentelemetry_handler.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
import pytest
1514
import mock
16-
15+
import pytest
1716
from grpc import StatusCode
1817

1918
from google.cloud.bigtable.data._metrics.data_model import (
@@ -23,8 +22,8 @@
2322
OperationType,
2423
)
2524
from google.cloud.bigtable.data._metrics.handlers.opentelemetry import (
26-
_OpenTelemetryInstruments,
2725
OpenTelemetryMetricsHandler,
26+
_OpenTelemetryInstruments,
2827
)
2928

3029

0 commit comments

Comments
 (0)