From 3be09c6d74ab3e69c99a4dfef5cac79d075b7142 Mon Sep 17 00:00:00 2001
From: Struan Shrimpton <sshrimp@google.com>
Date: Fri, 30 May 2025 15:29:30 -0700
Subject: [PATCH] telemetry: Fix imports

Logging was missing from __init__.py which broke under mac. This adds
that back in and remove unused imports from other files. The os check
is also moved up to be the first thing we look for since is_google_host
does not work with mac at the moment.

Bug:326277821
Change-Id: I3f28838d367eb9583332fd33ad35d71c0851fe4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6604498
Commit-Queue: Struan Shrimpton <sshrimp@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
---
 infra_lib/telemetry/__init__.py               | 11 ++++-------
 infra_lib/telemetry/__main__.py               |  1 -
 infra_lib/telemetry/anonymization_unittest.py |  1 -
 infra_lib/telemetry/clearcut_span_exporter.py |  3 +--
 infra_lib/telemetry/trace.py                  |  8 --------
 infra_lib/telemetry/trace_unittest.py         |  1 -
 6 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/infra_lib/telemetry/__init__.py b/infra_lib/telemetry/__init__.py
index 521aa6a4f..cad9b3806 100644
--- a/infra_lib/telemetry/__init__.py
+++ b/infra_lib/telemetry/__init__.py
@@ -2,19 +2,16 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 from typing import Optional
-import os
+import logging
 import socket
 import sys
-import pathlib
 
-from opentelemetry import context as otel_context_api
 from opentelemetry import trace as otel_trace_api
 from opentelemetry.sdk import (
     resources as otel_resources,
     trace as otel_trace_sdk,
 )
 from opentelemetry.sdk.trace import export as otel_export
-from opentelemetry.util import types as otel_types
 
 from . import config
 from . import clearcut_span_exporter
@@ -71,11 +68,11 @@ def is_google_host() -> bool:
 def initialize(service_name,
                notice=DEFAULT_BANNER,
                cfg_file=config.DEFAULT_CONFIG_FILE):
-    if not is_google_host():
+    # TODO(326277821): Add support for other platforms
+    if not sys.platform.startswith('linux'):
         return
 
-    # TODO(326277821): Add support for other platforms
-    if not sys.platform == 'linux':
+    if not is_google_host():
         return
 
     cfg = config.Config(cfg_file)
diff --git a/infra_lib/telemetry/__main__.py b/infra_lib/telemetry/__main__.py
index 18c56ee32..ca44b655f 100755
--- a/infra_lib/telemetry/__main__.py
+++ b/infra_lib/telemetry/__main__.py
@@ -5,7 +5,6 @@
 """Utility for opting in or out of metrics collection"""
 import argparse
 import sys
-import pathlib
 
 import config
 
diff --git a/infra_lib/telemetry/anonymization_unittest.py b/infra_lib/telemetry/anonymization_unittest.py
index 4bcc81604..7573d7cff 100644
--- a/infra_lib/telemetry/anonymization_unittest.py
+++ b/infra_lib/telemetry/anonymization_unittest.py
@@ -5,7 +5,6 @@
 
 import getpass
 import re
-import pytest
 
 from .proto import trace_span_pb2
 from . import anonymization
diff --git a/infra_lib/telemetry/clearcut_span_exporter.py b/infra_lib/telemetry/clearcut_span_exporter.py
index 81fbbb7ca..53b62ee78 100644
--- a/infra_lib/telemetry/clearcut_span_exporter.py
+++ b/infra_lib/telemetry/clearcut_span_exporter.py
@@ -9,9 +9,8 @@ import time
 import urllib.error
 import urllib.request
 
-from typing import Callable, Dict, Optional, Pattern, Sequence, Tuple
+from typing import Callable, Dict, Optional, Sequence
 from google.protobuf import (
-    json_format,
     message as proto_msg,
     struct_pb2,
 )
diff --git a/infra_lib/telemetry/trace.py b/infra_lib/telemetry/trace.py
index 50ba4d8f2..aeca5c508 100644
--- a/infra_lib/telemetry/trace.py
+++ b/infra_lib/telemetry/trace.py
@@ -5,20 +5,12 @@
 
 import contextlib
 from typing import Any, Iterator, Optional, Sequence
-import logging
-import pathlib
-import sys
 
 from opentelemetry import context as otel_context_api
 from opentelemetry import trace as otel_trace_api
 from opentelemetry.sdk import trace as otel_trace_sdk
 from opentelemetry.util import types as otel_types
 
-from . import config
-from . import clearcut_span_exporter
-from . import detector
-
-
 @contextlib.contextmanager
 def use_span(
     span: otel_trace_api.Span,
diff --git a/infra_lib/telemetry/trace_unittest.py b/infra_lib/telemetry/trace_unittest.py
index 6a068f94c..c79677d2d 100644
--- a/infra_lib/telemetry/trace_unittest.py
+++ b/infra_lib/telemetry/trace_unittest.py
@@ -8,7 +8,6 @@ from typing import Sequence
 
 from opentelemetry import trace as trace_api
 from opentelemetry.sdk import trace as trace_sdk
-from opentelemetry.sdk import resources
 from opentelemetry.sdk.trace import export as export_sdk
 
 from . import trace as trace