migrate code to use new semantic conventions

Author: scotthart

google/cloud/internal/grpc_opentelemetry.cc

@@ -25,7 +25,8 @@
 #ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 #include <opentelemetry/context/propagation/global_propagator.h>
 #include <opentelemetry/context/propagation/text_map_propagator.h>
-#include <opentelemetry/trace/semantic_conventions.h>
+#include <opentelemetry/semconv/incubating/rpc_attributes.h>
+#include <opentelemetry/semconv/network_attributes.h>
 #include <opentelemetry/trace/span_metadata.h>
 #include <opentelemetry/trace/span_startoptions.h>
 #endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
@@ -110,17 +111,17 @@ std::pair<std::string, std::string> MakeAttribute(
 opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> MakeSpanGrpc(
     opentelemetry::nostd::string_view service,
     opentelemetry::nostd::string_view method) {
-  namespace sc = opentelemetry::trace::SemanticConventions;
+  namespace sc = opentelemetry::semconv;
   opentelemetry::trace::StartSpanOptions options;
   options.kind = opentelemetry::trace::SpanKind::kClient;
   return internal::MakeSpan(
       absl::StrCat(absl::string_view{service.data(), service.size()}, "/",
                    absl::string_view{method.data(), method.size()}),
-      {{sc::kRpcSystem, sc::RpcSystemValues::kGrpc},
-       {sc::kRpcService, service},
-       {sc::kRpcMethod, method},
+      {{sc::rpc::kRpcSystem, sc::rpc::RpcSystemValues::kGrpc},
+       {sc::rpc::kRpcService, service},
+       {sc::rpc::kRpcMethod, method},
        {/*sc::kNetworkTransport=*/"network.transport",
-        sc::NetTransportValues::kIpTcp},
+        sc::network::NetworkTransportValues::kTcp},
        {"grpc.version", grpc::Version()}},
       options);
 }

google/cloud/internal/grpc_opentelemetry_test.cc

@@ -24,7 +24,8 @@
 #include <grpcpp/grpcpp.h>
 #ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 #include <opentelemetry/context/propagation/global_propagator.h>
-#include <opentelemetry/trace/semantic_conventions.h>
+#include <opentelemetry/semconv/incubating/rpc_attributes.h>
+#include <opentelemetry/semconv/network_attributes.h>
 #endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 
 namespace google {
@@ -57,7 +58,7 @@ using ::testing::IsEmpty;
 using ::testing::Pair;
 
 TEST(OpenTelemetry, MakeSpanGrpc) {
-  namespace sc = ::opentelemetry::trace::SemanticConventions;
+  namespace sc = ::opentelemetry::semconv;
   auto span_catcher = InstallSpanCatcher();
 
   auto span = MakeSpanGrpc("google.cloud.foo.v1.Foo", "GetBar");
@@ -70,14 +71,14 @@ TEST(OpenTelemetry, MakeSpanGrpc) {
           SpanHasInstrumentationScope(), SpanKindIsClient(),
           SpanNamed("google.cloud.foo.v1.Foo/GetBar"),
           SpanHasAttributes(
-              OTelAttribute<std::string>(sc::kRpcSystem,
-                                         sc::RpcSystemValues::kGrpc),
-              OTelAttribute<std::string>(sc::kRpcService,
+              OTelAttribute<std::string>(sc::rpc::kRpcSystem,
+                                         sc::rpc::RpcSystemValues::kGrpc),
+              OTelAttribute<std::string>(sc::rpc::kRpcService,
                                          "google.cloud.foo.v1.Foo"),
-              OTelAttribute<std::string>(sc::kRpcMethod, "GetBar"),
+              OTelAttribute<std::string>(sc::rpc::kRpcMethod, "GetBar"),
               OTelAttribute<std::string>(
                   /*sc::kNetworkTransport=*/"network.transport",
-                  sc::NetTransportValues::kIpTcp),
+                  sc::network::NetworkTransportValues::kTcp),
               OTelAttribute<std::string>("grpc.version", grpc::Version())))));
 }
 

google/cloud/internal/rest_opentelemetry.cc

@@ -22,8 +22,8 @@
 #include "absl/strings/match.h"
 #include <opentelemetry/context/propagation/global_propagator.h>
 #include <opentelemetry/context/propagation/text_map_propagator.h>
+#include <opentelemetry/semconv/network_attributes.h>
 #include <opentelemetry/trace/provider.h>
-#include <opentelemetry/trace/semantic_conventions.h>
 #include <opentelemetry/trace/span_metadata.h>
 #include <opentelemetry/trace/span_startoptions.h>
 
@@ -71,13 +71,13 @@ void InjectTraceContext(
 
 opentelemetry::nostd::shared_ptr<opentelemetry::trace::Span> MakeSpanHttp(
     RestRequest const& request, opentelemetry::nostd::string_view method) {
-  namespace sc = opentelemetry::trace::SemanticConventions;
+  namespace sc = opentelemetry::semconv;
   opentelemetry::trace::StartSpanOptions options;
   options.kind = opentelemetry::trace::SpanKind::kClient;
   auto span = internal::MakeSpan(
       absl::StrCat("HTTP/", absl::string_view{method.data(), method.size()}),
       {{/*sc::kNetworkTransport=*/"network.transport",
-        sc::NetTransportValues::kIpTcp},
+        sc::network::NetworkTransportValues::kTcp},
        {/*sc::kHttpRequestMethod=*/"http.request.method", method},
        {/*sc::kUrlFull=*/"url.full", request.path()}},
       options);

google/cloud/internal/rest_opentelemetry_test.cc

@@ -17,7 +17,7 @@
 #include "google/cloud/testing_util/opentelemetry_matchers.h"
 #include "google/cloud/testing_util/status_matchers.h"
 #include <gmock/gmock.h>
-#include <opentelemetry/trace/semantic_conventions.h>
+#include <opentelemetry/semconv/network_attributes.h>
 
 namespace google {
 namespace cloud {
@@ -39,7 +39,7 @@ using ::testing::Gt;
 using ::testing::Pair;
 
 TEST(RestOpentelemetry, MakeSpanHttp) {
-  namespace sc = ::opentelemetry::trace::SemanticConventions;
+  namespace sc = ::opentelemetry::semconv;
   auto span_catcher = InstallSpanCatcher();
 
   auto constexpr kUrl = "https://storage.googleapis.com/storage/v1/b/my-bucket";
@@ -66,7 +66,7 @@ TEST(RestOpentelemetry, MakeSpanHttp) {
           SpanHasAttributes(
               OTelAttribute<std::string>(
                   /*sc::kNetworkTransport=*/"network.transport",
-                  sc::NetTransportValues::kIpTcp),
+                  sc::network::NetworkTransportValues::kTcp),
               OTelAttribute<std::string>(
                   /*sc::kHttpRequestMethod=*/"http.request.method", "GET"),
               OTelAttribute<std::string>(/*sc::kUrlFull=*/"url.full", kUrl),

google/cloud/internal/tracing_http_payload_test.cc

@@ -20,7 +20,7 @@
 #include "google/cloud/testing_util/status_matchers.h"
 #include <gmock/gmock.h>
 #include <opentelemetry/context/propagation/global_propagator.h>
-#include <opentelemetry/trace/semantic_conventions.h>
+#include <opentelemetry/semconv/incubating/network_attributes.h>
 
 namespace google {
 namespace cloud {
@@ -66,7 +66,7 @@ auto MakeReadMatcher(std::int64_t buffer_size) {
 }
 
 TEST(TracingHttpPayload, Success) {
-  namespace sc = ::opentelemetry::trace::SemanticConventions;
+  namespace sc = ::opentelemetry::semconv;
   auto span_catcher = InstallSpanCatcher();
 
   auto impl = MakeMockHttpPayloadSuccess(MockContents());
@@ -86,13 +86,13 @@ TEST(TracingHttpPayload, Success) {
           SpanKindIsClient(),
           SpanHasAttributes(OTelAttribute<std::string>(
               /*sc::kNetworkTransport=*/"network.transport",
-              sc::NetTransportValues::kIpTcp)),
+              sc::network::NetworkTransportValues::kTcp)),
           SpanHasEvents(MakeReadMatcher(16, 16), MakeReadMatcher(16, 16),
                         MakeReadMatcher(16, 11), MakeReadMatcher(16, 0)))));
 }
 
 TEST(TracingHttpPayload, Failure) {
-  namespace sc = ::opentelemetry::trace::SemanticConventions;
+  namespace sc = ::opentelemetry::semconv;
   auto span_catcher = InstallSpanCatcher();
 
   RestRequest request("https://example.com/ignored");
@@ -120,7 +120,7 @@ TEST(TracingHttpPayload, Failure) {
           SpanHasAttributes(
               OTelAttribute<std::string>(
                   /*sc::kNetworkTransport=*/"network.transport",
-                  sc::NetTransportValues::kIpTcp),
+                  sc::network::NetworkTransportValues::kTcp),
               OTelAttribute<std::string>("gl-cpp.status_code", "UNAVAILABLE")),
           SpanHasEvents(MakeReadMatcher(16, 16), MakeReadMatcher(16)))));
 }

google/cloud/internal/tracing_rest_client_test.cc

@@ -21,8 +21,8 @@
 #include <gmock/gmock.h>
 #ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 #include <opentelemetry/context/propagation/global_propagator.h>
+#include <opentelemetry/semconv/incubating/network_attributes.h>
 #include <opentelemetry/trace/propagation/http_trace_context.h>
-#include <opentelemetry/trace/semantic_conventions.h>
 #endif  // GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY
 
 namespace google {
@@ -66,7 +66,7 @@ using ::testing::ResultOf;
 using ::testing::UnorderedElementsAre;
 
 TEST(TracingRestClient, Delete) {
-  namespace sc = ::opentelemetry::trace::SemanticConventions;
+  namespace sc = ::opentelemetry::semconv;
   auto span_catcher = InstallSpanCatcher();
 
   auto impl = std::make_unique<MockRestClient>();
@@ -107,7 +107,7 @@ TEST(TracingRestClient, Delete) {
               SpanHasAttributes(
                   OTelAttribute<std::string>(
                       /*sc::kNetworkTransport=*/"network.transport",
-                      sc::NetTransportValues::kIpTcp),
+                      sc::network::NetworkTransportValues::kTcp),
                   OTelAttribute<std::string>(
                       /*sc::kHttpRequestMethod=*/"http.request.method",
                       "DELETE"),
@@ -209,7 +209,7 @@ TEST(TracingRestClient, PropagatesTraceContext) {
 }
 
 TEST(TracingRestClient, WithRestContextDetails) {
-  namespace sc = ::opentelemetry::trace::SemanticConventions;
+  namespace sc = ::opentelemetry::semconv;
   auto span_catcher = InstallSpanCatcher();
 
   auto impl = std::make_unique<MockRestClient>();
@@ -256,7 +256,7 @@ TEST(TracingRestClient, WithRestContextDetails) {
               SpanHasAttributes(
                   OTelAttribute<std::string>(
                       /*sc::kNetworkTransport=*/"network.transport",
-                      sc::NetTransportValues::kIpTcp),
+                      sc::network::NetworkTransportValues::kTcp),
                   OTelAttribute<std::string>(
                       /*sc::kHttpRequestMethod=*/"http.request.method", "POST"),
                   OTelAttribute<std::string>(/*sc::kUrlFull=*/"url.full", kUrl),

google/cloud/internal/tracing_rest_response_test.cc

@@ -21,7 +21,7 @@
 #include "google/cloud/testing_util/status_matchers.h"
 #include <gmock/gmock.h>
 #include <opentelemetry/context/propagation/global_propagator.h>
-#include <opentelemetry/trace/semantic_conventions.h>
+#include <opentelemetry/semconv/incubating/network_attributes.h>
 
 namespace google {
 namespace cloud {
@@ -57,7 +57,7 @@ auto MakeReadMatcher(std::int64_t buffer_size, std::int64_t read_size) {
 }
 
 TEST(TracingRestResponseTest, Success) {
-  namespace sc = ::opentelemetry::trace::SemanticConventions;
+  namespace sc = ::opentelemetry::semconv;
   auto span_catcher = InstallSpanCatcher();
 
   RestRequest request("https://example.com/ignored");
@@ -89,7 +89,7 @@ TEST(TracingRestResponseTest, Success) {
                        SpanKindIsClient(),
                        SpanHasAttributes(OTelAttribute<std::string>(
                            /*sc::kNetworkTransport=*/"network.transport",
-                           sc::NetTransportValues::kIpTcp)),
+                           sc::network::NetworkTransportValues::kTcp)),
                        SpanHasEvents(MakeReadMatcher(kBufferSize, content_size),
                                      MakeReadMatcher(kBufferSize, 0)))));
 }

google/cloud/opentelemetry/integration_tests/monitoring_exporter_integration_test.cc

@@ -28,7 +28,7 @@
 #include <opentelemetry/sdk/metrics/push_metric_exporter.h>
 #include <opentelemetry/sdk/metrics/view/view_registry.h>
 #include <opentelemetry/sdk/resource/resource.h>
-#include <opentelemetry/sdk/resource/semantic_conventions.h>
+#include <opentelemetry/semconv/incubating/service_attributes.h>
 
 namespace google {
 namespace cloud {
@@ -40,7 +40,7 @@ using ::testing::IsEmpty;
 using ::testing::Not;
 namespace metrics_api = ::opentelemetry::metrics;
 namespace metrics_sdk = ::opentelemetry::sdk::metrics;
-namespace sc = opentelemetry::sdk::resource::SemanticConventions;
+namespace sc = opentelemetry::semconv;
 
 auto constexpr kJobName = "monitoring_exporter_integration_test";
 auto constexpr kMeterName =
@@ -59,9 +59,9 @@ void InstallExporter(std::unique_ptr<metrics_sdk::PushMetricExporter> exporter,
   // attributes which will map to a `generic_task`, which seems apt for this
   // workflow.
   auto resource = opentelemetry::sdk::resource::Resource::Create(
-      {{sc::kServiceNamespace, "gl-cpp"},
-       {sc::kServiceName, kJobName},
-       {sc::kServiceInstanceId, task_id}});
+      {{sc::service::kServiceNamespace, "gl-cpp"},
+       {sc::service::kServiceName, kJobName},
+       {sc::service::kServiceInstanceId, task_id}});
 
   // Initialize and set the global MeterProvider
   metrics_sdk::PeriodicExportingMetricReaderOptions options;