stop using deprecated otel semantic

scotthart · scotthart · commit a943ba2b7f6d · 2025-12-04T13:05:15.000-05:00
diff --git a/google/cloud/pubsub/internal/batching_publisher_tracing_connection.cc b/google/cloud/pubsub/internal/batching_publisher_tracing_connection.cc
@@ -39,7 +39,7 @@ class BatchingPublisherTracingConnection : public pubsub::PublisherConnection {
     namespace sc = opentelemetry::semconv;
     auto span =
         internal::MakeSpan("publisher batching",
-                           {{sc::code::kCodeFunction,
+                           {{sc::code::kCodeFunctionName,
                              "pubsub::BatchingPublisherConnection::Publish"}});
     auto result = child_->Publish(std::move(p));
     internal::EndSpan(*span);
diff --git a/google/cloud/pubsub/internal/batching_publisher_tracing_connection_test.cc b/google/cloud/pubsub/internal/batching_publisher_tracing_connection_test.cc
@@ -72,7 +72,7 @@ TEST(BatchingPublisherTracingConnectionTest, PublishSpan) {
                 SpanWithStatus(opentelemetry::trace::StatusCode::kOk),
                 SpanHasAttributes(
                     OTelAttribute<std::string>(
-                        sc::code::kCodeFunction,
+                        sc::code::kCodeFunctionName,
                         "pubsub::BatchingPublisherConnection::Publish"),
                     OTelAttribute<std::string>("gl-cpp.status_code", "OK")))));
 }
diff --git a/google/cloud/pubsub/internal/blocking_publisher_tracing_connection.cc b/google/cloud/pubsub/internal/blocking_publisher_tracing_connection.cc
@@ -48,7 +48,7 @@ opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> StartPublishSpan(
        {/*sc::messaging::kMessagingMessageEnvelopeSize=*/"messaging.message."
                                                          "envelope.size",
         static_cast<std::int64_t>(MessageSize(m))},
-       {sc::code::kCodeFunction, "pubsub::BlockingPublisher::Publish"}},
+       {sc::code::kCodeFunctionName, "pubsub::BlockingPublisher::Publish"}},
       options);
   if (!m.ordering_key().empty()) {
     span->SetAttribute("messaging.gcp_pubsub.message.ordering_key",
diff --git a/google/cloud/pubsub/internal/blocking_publisher_tracing_connection_test.cc b/google/cloud/pubsub/internal/blocking_publisher_tracing_connection_test.cc
@@ -95,7 +95,7 @@ TEST(BlockingPublisherTracingConnectionTest, PublishSpanOnSuccess) {
                                "messaging.message.envelope.size", 45),
               OTelAttribute<std::string>("messaging.message_id", "test-id-0"),
               OTelAttribute<std::string>(
-                  sc::code::kCodeFunction,
+                  sc::code::kCodeFunctionName,
                   "pubsub::BlockingPublisher::Publish")))));
 }
 
diff --git a/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection.cc b/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection.cc
@@ -41,7 +41,7 @@ class FlowControlledPublisherTracingConnection
     namespace sc = ::opentelemetry::semconv;
     auto span = internal::MakeSpan(
         "publisher flow control",
-        {{sc::code::kCodeFunction,
+        {{sc::code::kCodeFunctionName,
           "pubsub::FlowControlledPublisherConnection::Publish"}});
     auto result = child_->Publish(std::move(p));
     internal::EndSpan(*span);
diff --git a/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection_test.cc b/google/cloud/pubsub/internal/flow_controlled_publisher_tracing_connection_test.cc
@@ -75,7 +75,7 @@ TEST(FlowControlledPublisherTracingConnectionTest, PublishSpan) {
                 SpanWithStatus(opentelemetry::trace::StatusCode::kOk),
                 SpanHasAttributes(
                     OTelAttribute<std::string>(
-                        sc::code::kCodeFunction,
+                        sc::code::kCodeFunctionName,
                         "pubsub::FlowControlledPublisherConnection::Publish"),
                     OTelAttribute<std::string>("gl-cpp.status_code", "OK")))));
 }
diff --git a/google/cloud/pubsub/internal/publisher_tracing_connection.cc b/google/cloud/pubsub/internal/publisher_tracing_connection.cc
@@ -58,7 +58,7 @@ opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> StartPublishSpan(
        {/*sc::messaging::kMessagingMessageEnvelopeSize=*/"messaging.message."
                                                          "envelope.size",
         static_cast<std::int64_t>(MessageSize(m))},
-       {sc::code::kCodeFunction, "pubsub::PublisherConnection::Publish"}},
+       {sc::code::kCodeFunctionName, "pubsub::PublisherConnection::Publish"}},
       options);
   if (!m.ordering_key().empty()) {
     span->SetAttribute("messaging.gcp_pubsub.message.ordering_key",
diff --git a/google/cloud/pubsub/internal/publisher_tracing_connection_test.cc b/google/cloud/pubsub/internal/publisher_tracing_connection_test.cc
@@ -104,7 +104,7 @@ TEST(PublisherTracingConnectionTest, PublishSpanOnSuccess) {
               OTelAttribute<std::string>(sc::messaging::kMessagingMessageId,
                                          "test-id-0"),
               OTelAttribute<std::string>(
-                  sc::code::kCodeFunction,
+                  sc::code::kCodeFunctionName,
                   "pubsub::PublisherConnection::Publish")))));
 }
 
diff --git a/google/cloud/pubsub/internal/subscriber_tracing_connection.cc b/google/cloud/pubsub/internal/subscriber_tracing_connection.cc
@@ -45,7 +45,7 @@ opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> StartPullSpan() {
       {{sc::messaging::kMessagingSystem, "gcp_pubsub"},
        {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type",
         "receive"},
-       {sc::code::kCodeFunction, "pubsub::SubscriberConnection::Pull"},
+       {sc::code::kCodeFunctionName, "pubsub::SubscriberConnection::Pull"},
        {"gcp.project_id", subscription.project_id()},
        {sc::messaging::kMessagingDestinationName,
         subscription.subscription_id()}},
diff --git a/google/cloud/pubsub/internal/subscriber_tracing_connection_test.cc b/google/cloud/pubsub/internal/subscriber_tracing_connection_test.cc
@@ -151,7 +151,7 @@ TEST(SubscriberTracingConnectionTest, PullAttributes) {
   EXPECT_THAT(spans,
               Contains(AllOf(SpanNamed("test-subscription receive"),
                              SpanHasAttributes(OTelAttribute<std::string>(
-                                 sc::code::kCodeFunction,
+                                 sc::code::kCodeFunctionName,
                                  "pubsub::SubscriberConnection::Pull")))));
   EXPECT_THAT(spans,
               Contains(AllOf(SpanNamed("test-subscription receive"),
diff --git a/google/cloud/pubsub/internal/tracing_batch_sink.cc b/google/cloud/pubsub/internal/tracing_batch_sink.cc
@@ -70,7 +70,7 @@ auto MakeParent(Links const& links, Spans const& message_spans,
       /*attributes=*/
       {{sc::messaging::kMessagingBatchMessageCount,
         static_cast<std::int64_t>(message_spans.size())},
-       {sc::code::kCodeFunction, "BatchSink::AsyncPublish"},
+       {sc::code::kCodeFunctionName, "BatchSink::AsyncPublish"},
        {/*sc::messaging::kMessagingOperationType=*/
         "messaging.operation.type", "publish"},
        {sc::thread::kThreadId, internal::CurrentThreadId()},
diff --git a/google/cloud/pubsub/internal/tracing_batch_sink_test.cc b/google/cloud/pubsub/internal/tracing_batch_sink_test.cc
@@ -204,10 +204,10 @@ TEST(TracingBatchSink, PublishSpanHasAttributes) {
                              SpanHasAttributes(OTelAttribute<std::string>(
                                  sc::thread::kThreadId, _)))));
   EXPECT_THAT(spans,
-              Contains(AllOf(
-                  SpanNamed("test-topic publish"),
-                  SpanHasAttributes(OTelAttribute<std::string>(
-                      sc::code::kCodeFunction, "BatchSink::AsyncPublish")))));
+              Contains(AllOf(SpanNamed("test-topic publish"),
+                             SpanHasAttributes(OTelAttribute<std::string>(
+                                 sc::code::kCodeFunctionName,
+                                 "BatchSink::AsyncPublish")))));
   EXPECT_THAT(spans,
               Contains(AllOf(SpanNamed("test-topic publish"),
                              SpanHasAttributes(OTelAttribute<std::string>(
diff --git a/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler.cc b/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler.cc
@@ -68,7 +68,7 @@ class TracingExactlyOnceAckHandler
     auto sub = subscription();
     auto span = internal::MakeSpan(
         sub.subscription_id() + " ack",
-        {{sc::code::kCodeFunction, "pubsub::AckHandler::ack"},
+        {{sc::code::kCodeFunctionName, "pubsub::AckHandler::ack"},
          {sc::messaging::kMessagingSystem, "gcp_pubsub"},
          {"messaging.gcp_pubsub.message.ack_id", ack_id()},
          {"messaging.gcp_pubsub.subscription.template", sub.FullName()},
@@ -98,7 +98,7 @@ class TracingExactlyOnceAckHandler
     auto sub = subscription();
     auto span = internal::MakeSpan(
         sub.subscription_id() + " nack",
-        {{sc::code::kCodeFunction, "pubsub::AckHandler::nack"},
+        {{sc::code::kCodeFunctionName, "pubsub::AckHandler::nack"},
          {sc::messaging::kMessagingSystem, "gcp_pubsub"},
          {"messaging.gcp_pubsub.message.ack_id", ack_id()},
          {"messaging.gcp_pubsub.subscription.template", sub.FullName()},
diff --git a/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler_test.cc b/google/cloud/pubsub/internal/tracing_exactly_once_ack_handler_test.cc
@@ -169,7 +169,7 @@ TEST(TracingAckHandlerTest, AckAttributes) {
               OTelAttribute<std::string>(
                   /*sc::messaging::kMessagingOperationType=*/
                   "messaging.operation.type", "settle"),
-              OTelAttribute<std::string>(sc::code::kCodeFunction,
+              OTelAttribute<std::string>(sc::code::kCodeFunctionName,
                                          "pubsub::AckHandler::ack"),
               OTelAttribute<std::int32_t>(
                   "messaging.gcp_pubsub.message.delivery_attempt", 42),
@@ -279,7 +279,7 @@ TEST(TracingAckHandlerTest, NackAttributes) {
               OTelAttribute<std::string>(
                   /*sc::messaging::kMessagingOperationType=*/
                   "messaging.operation.type", "settle"),
-              OTelAttribute<std::string>(sc::code::kCodeFunction,
+              OTelAttribute<std::string>(sc::code::kCodeFunctionName,
                                          "pubsub::AckHandler::nack"),
               OTelAttribute<std::int32_t>(
                   "messaging.gcp_pubsub.message.delivery_attempt", 42),
diff --git a/google/cloud/pubsub/internal/tracing_pull_ack_handler.cc b/google/cloud/pubsub/internal/tracing_pull_ack_handler.cc
@@ -66,8 +66,8 @@ class TracingPullAckHandler : public pubsub::PullAckHandler::Impl {
     auto const ack_id = child_->ack_id();
     auto const subscription = child_->subscription();
     TracingAttributes attributes = MakeSharedAttributes(ack_id, subscription);
-    attributes.emplace_back(
-        std::make_pair(sc::code::kCodeFunction, "pubsub::PullAckHandler::ack"));
+    attributes.emplace_back(std::make_pair(sc::code::kCodeFunctionName,
+                                           "pubsub::PullAckHandler::ack"));
     attributes.emplace_back(std::make_pair(
         /*sc::messaging::kMessagingOperationType=*/"messaging.operation.type",
         "ack"));
@@ -93,7 +93,7 @@ class TracingPullAckHandler : public pubsub::PullAckHandler::Impl {
     auto const ack_id = child_->ack_id();
     auto const subscription = child_->subscription();
     TracingAttributes attributes = MakeSharedAttributes(ack_id, subscription);
-    attributes.emplace_back(std::make_pair(sc::code::kCodeFunction,
+    attributes.emplace_back(std::make_pair(sc::code::kCodeFunctionName,
                                            "pubsub::PullAckHandler::nack"));
     attributes.emplace_back(std::make_pair(
         /*sc::messaging::kMessagingOperationType=*/"messaging.operation.type",
diff --git a/google/cloud/pubsub/internal/tracing_pull_ack_handler_test.cc b/google/cloud/pubsub/internal/tracing_pull_ack_handler_test.cc
@@ -121,7 +121,7 @@ TEST(TracingAckHandlerTest, AckAttributes) {
   EXPECT_THAT(spans,
               Contains(AllOf(SpanNamed("test-subscription ack"),
                              SpanHasAttributes(OTelAttribute<std::string>(
-                                 sc::code::kCodeFunction,
+                                 sc::code::kCodeFunctionName,
                                  "pubsub::PullAckHandler::ack")))));
   EXPECT_THAT(spans,
               Contains(AllOf(
@@ -196,7 +196,7 @@ TEST(TracingAckHandlerTest, NackAttributes) {
   EXPECT_THAT(spans,
               Contains(AllOf(SpanNamed("test-subscription nack"),
                              SpanHasAttributes(OTelAttribute<std::string>(
-                                 sc::code::kCodeFunction,
+                                 sc::code::kCodeFunctionName,
                                  "pubsub::PullAckHandler::nack")))));
   EXPECT_THAT(spans,
               Contains(AllOf(
diff --git a/google/cloud/pubsub/internal/tracing_pull_lease_manager.cc b/google/cloud/pubsub/internal/tracing_pull_lease_manager.cc
@@ -61,7 +61,7 @@ class TracingPullLeaseManagerImpl : public PullLeaseManagerImpl {
         {{sc::messaging::kMessagingSystem, "gcp_pubsub"},
          {/*sc::messaging::kMessagingOperationType=*/"messaging.operation.type",
           "modack"},
-         {sc::code::kCodeFunction, "pubsub::PullLeaseManager::ExtendLease"},
+         {sc::code::kCodeFunctionName, "pubsub::PullLeaseManager::ExtendLease"},
          {"messaging.gcp_pubsub.message.ack_id", ack_id_},
          {"messaging.gcp_pubsub.message.ack_deadline_seconds",
           static_cast<std::int32_t>(request.ack_deadline_seconds())},
diff --git a/google/cloud/pubsub/internal/tracing_pull_lease_manager_test.cc b/google/cloud/pubsub/internal/tracing_pull_lease_manager_test.cc
@@ -181,7 +181,7 @@ TEST(TracingPullLeaseManagerImplTest, AsyncModifyAckDeadlineAttributes) {
   EXPECT_THAT(spans,
               Contains(AllOf(SpanNamed("test-subscription modack"),
                              SpanHasAttributes(OTelAttribute<std::string>(
-                                 sc::code::kCodeFunction,
+                                 sc::code::kCodeFunctionName,
                                  "pubsub::PullLeaseManager::ExtendLease")))));
   EXPECT_THAT(
       spans,
diff --git a/google/cloud/spanner/samples/graph_samples.cc b/google/cloud/spanner/samples/graph_samples.cc
@@ -21,6 +21,7 @@
 #include "google/cloud/spanner/timestamp.h"
 #include "google/cloud/internal/getenv.h"
 #include "google/cloud/log.h"
+#include "absl/time/clock.h"
 #include <string>
 #include <tuple>
 #include <utility>

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ TEST(BatchingPublisherTracingConnectionTest, PublishSpan) {`
`72`	`72`	`SpanWithStatus(opentelemetry::trace::StatusCode::kOk),`
`73`	`73`	`SpanHasAttributes(`
`74`	`74`	`OTelAttribute<std::string>(`
`75`		`- sc::code::kCodeFunction,`
	`75`	`+ sc::code::kCodeFunctionName,`
`76`	`76`	`"pubsub::BatchingPublisherConnection::Publish"),`
`77`	`77`	`OTelAttribute<std::string>("gl-cpp.status_code", "OK")))));`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ TEST(BlockingPublisherTracingConnectionTest, PublishSpanOnSuccess) {`
`95`	`95`	`"messaging.message.envelope.size", 45),`
`96`	`96`	`OTelAttribute<std::string>("messaging.message_id", "test-id-0"),`
`97`	`97`	`OTelAttribute<std::string>(`
`98`		`- sc::code::kCodeFunction,`
	`98`	`+ sc::code::kCodeFunctionName,`
`99`	`99`	`"pubsub::BlockingPublisher::Publish")))));`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ TEST(FlowControlledPublisherTracingConnectionTest, PublishSpan) {`
`75`	`75`	`SpanWithStatus(opentelemetry::trace::StatusCode::kOk),`
`76`	`76`	`SpanHasAttributes(`
`77`	`77`	`OTelAttribute<std::string>(`
`78`		`- sc::code::kCodeFunction,`
	`78`	`+ sc::code::kCodeFunctionName,`
`79`	`79`	`"pubsub::FlowControlledPublisherConnection::Publish"),`
`80`	`80`	`OTelAttribute<std::string>("gl-cpp.status_code", "OK")))));`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ TEST(PublisherTracingConnectionTest, PublishSpanOnSuccess) {`
`104`	`104`	`OTelAttribute<std::string>(sc::messaging::kMessagingMessageId,`
`105`	`105`	`"test-id-0"),`
`106`	`106`	`OTelAttribute<std::string>(`
`107`		`- sc::code::kCodeFunction,`
	`107`	`+ sc::code::kCodeFunctionName,`
`108`	`108`	`"pubsub::PublisherConnection::Publish")))));`
`109`	`109`	`}`
`110`	`110`