Skip to content

Commit 80f0ba0

Browse files
committed
ci failure fix
1 parent 9bc244d commit 80f0ba0

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

google/cloud/storage/internal/tracing_connection.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ void TracingConnection::MaybeTriggerBackgroundFetch(
9494
}
9595
}
9696

97-
9897
void TracingConnection::EnrichSpan(opentelemetry::trace::Span& span,
9998
std::string const& bucket_name) {
10099
if (bucket_name.empty()) return;

google/cloud/storage/internal/tracing_connection.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ class TracingConnection : public storage::internal::StorageConnection {
187187
std::string const& bucket_name);
188188
void EnrichSpan(opentelemetry::trace::Span& span,
189189
storage::BucketMetadata const& metadata);
190-
void EnrichSpan(opentelemetry::trace::Span& span,
191-
BucketCacheEntry const& entry);
190+
static void EnrichSpan(opentelemetry::trace::Span& span,
191+
BucketCacheEntry const& entry);
192192
void MaybeTriggerBackgroundFetch(std::string const& bucket_name);
193193
void CleanupCompletedTasks();
194194

google/cloud/storage/internal/tracing_connection_test.cc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,7 +1728,8 @@ TEST(TracingClientTest, BucketMetadataMaybeInvalidateBucketLevelEvict) {
17281728
});
17291729

17301730
(void)under_test.GetObjectMetadata(
1731-
storage::internal::GetObjectMetadataRequest("test-bucket", "test-object"));
1731+
storage::internal::GetObjectMetadataRequest("test-bucket",
1732+
"test-object"));
17321733
}
17331734

17341735
TEST(TracingClientTest, BucketMetadataMaybeInvalidateObjectLevelNoEvict) {
@@ -1758,7 +1759,8 @@ TEST(TracingClientTest, BucketMetadataMaybeInvalidateObjectLevelNoEvict) {
17581759
return Status(StatusCode::kNotFound, "Object not found");
17591760
});
17601761
(void)under_test.GetObjectMetadata(
1761-
storage::internal::GetObjectMetadataRequest("test-bucket", "test-object"));
1762+
storage::internal::GetObjectMetadataRequest("test-bucket",
1763+
"test-object"));
17621764

17631765
// Verify that the cache entry was NOT evicted.
17641766
testing::Mock::VerifyAndClearExpectations(mock.get());
@@ -1772,7 +1774,8 @@ TEST(TracingClientTest, BucketMetadataMaybeInvalidateObjectLevelNoEvict) {
17721774
EXPECT_CALL(*mock, GetBucketMetadata).Times(0);
17731775

17741776
(void)under_test.GetObjectMetadata(
1775-
storage::internal::GetObjectMetadataRequest("test-bucket", "test-object"));
1777+
storage::internal::GetObjectMetadataRequest("test-bucket",
1778+
"test-object"));
17761779
}
17771780

17781781
} // namespace

0 commit comments

Comments
 (0)