Fix merge issues

Author: DylanRussell

opentelemetry-exporter-gcp-logging/src/opentelemetry/exporter/cloud_logging/__init__.py

@@ -1,17 +1,3 @@
-# Copyright 2025 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# Remove after this program no longer support Python 3.8.*
 from __future__ import annotations
 # Copyright 2025 Google LLC
 #
@@ -29,16 +15,8 @@
 import datetime
 import logging
 import urllib.parse
-import logging
-import urllib.parse
 from typing import Optional, Sequence
 
-import google.auth
-from google.api.monitored_resource_pb2 import MonitoredResource  # type: ignore
-from google.cloud.logging_v2.services.logging_service_v2 import (
-    LoggingServiceV2Client,
-)
-
 import google.auth
 from google.api.monitored_resource_pb2 import MonitoredResource  # type: ignore
 from google.cloud.logging_v2.services.logging_service_v2 import (
@@ -52,20 +30,13 @@
 from google.protobuf.struct_pb2 import Struct
 from google.protobuf.timestamp_pb2 import Timestamp
 from opentelemetry.exporter.cloud_logging.version import __version__
-from google.logging.type.log_severity_pb2 import LogSeverity  # type: ignore
-from google.protobuf.struct_pb2 import Struct
-from google.protobuf.timestamp_pb2 import Timestamp
-from opentelemetry.exporter.cloud_logging.version import __version__
 from opentelemetry.resourcedetector.gcp_resource_detector._mapping import (
     get_monitored_resource,
 )
 from opentelemetry.sdk import version as opentelemetry_sdk_version
 from opentelemetry.sdk._logs import LogData
 from opentelemetry.sdk._logs.export import LogExporter
 from opentelemetry.sdk.resources import Resource
-from opentelemetry.sdk._logs import LogData
-from opentelemetry.sdk._logs.export import LogExporter
-from opentelemetry.sdk.resources import Resource
 
 DEFAULT_MAX_ENTRY_SIZE = 256000  # 256 KB
 DEFAULT_MAX_REQUEST_SIZE = 10000000  # 10 MB
@@ -166,7 +137,6 @@ def export(self, batch: Sequence[LogData]):
                 log_record.resource or Resource({})
             )
             # convert it to proto
-            monitored_resource: Optional[MonitoredResource] = (
             monitored_resource: Optional[MonitoredResource] = (
                 MonitoredResource(
                     type=monitored_resource_data.type,
@@ -198,8 +168,6 @@ def export(self, batch: Sequence[LogData]):
             log_entry.trace_sampled = (
                 log_record.trace_flags is not None
                 and log_record.trace_flags.sampled
-                log_record.trace_flags is not None
-                and log_record.trace_flags.sampled
             )
             if TRACE_SAMPLED_ATTRIBUTE_KEY in attrs_map:
                 log_entry.trace_sampled |= bool(
@@ -255,4 +223,4 @@ def _write_log_entries(self, log_entries: list[LogEntry]):
             self.client.write_log_entries(entries=batch)
 
     def shutdown(self):
-        pass
+        pass

opentelemetry-exporter-gcp-logging/tests/test_cloud_logging.py

@@ -54,21 +54,17 @@ def test_invalid_otlp_entries_raise_warnings(caplog) -> None:
     no_default_logname = CloudLoggingExporter(
         project_id=PROJECT_ID, client=client
     )
-    attrs = {str(i):"i" * 10000 for i in range(1000)}
-    log_record = LogRecord(resource=Resource({}),
-                            attributes=attrs)
     no_default_logname.export(
         [
             LogData(
-                log_record=log_record,
-                log_record=log_record,
+                    log_record = LogRecord(resource=Resource({}),
+                            attributes={str(i):"i" * 10000 for i in range(1000)}),
                 instrumentation_scope=InstrumentationScope("test"),
             )
         ]
     )
     assert len(caplog.records) == 1
     assert "exceeds Cloud Logging's maximum limit of 256000.\n" in caplog.text
-    assert "exceeds Cloud Logging's maximum limit of 256000.\n" in caplog.text
 
 
 def test_convert_otlp(
@@ -85,10 +81,6 @@ def test_convert_otlp(
             "gen_ai.system": "openai",
             "event.name": "gen_ai.system.message",
         },
-        attributes={
-            "gen_ai.system": "openai",
-            "event.name": "gen_ai.system.message",
-        },
         body={
             "kvlistValue": {
                 "values": [
@@ -112,8 +104,6 @@ def test_convert_otlp(
         LogData(
             log_record=log_record,
             instrumentation_scope=InstrumentationScope("test"),
-            log_record=log_record,
-            instrumentation_scope=InstrumentationScope("test"),
         )
     ]
     cloudloggingfake.exporter.export(log_data)