Merge pull request #716 from open-telemetry/main

merged from upstream

Author: malkia

CHANGELOG.md

@@ -36,6 +36,9 @@ Increment the:
 * [BUILD] Upgrade to rapidyaml 0.10.0
   [#3906](https://github.com/open-telemetry/opentelemetry-cpp/pull/3906)
 
+* [EXAMPLES] Deprecated semantic conventions used
+  [#3905](https://github.com/open-telemetry/opentelemetry-cpp/pull/3905)
+
 Important changes:
 
 * [BUILD] Revisit EventLogger deprecation

examples/common/metrics_foo_library/foo_library.cc

@@ -169,7 +169,7 @@ void foo_library::semconv_observable_counter_example()
   auto provider = metrics_api::Provider::GetMeterProvider();
   opentelemetry::nostd::shared_ptr<metrics_api::Meter> meter = provider->GetMeter("demo", "1.2.0");
   double_observable_counter =
-      opentelemetry::semconv::system::CreateAsyncDoubleMetricSystemCpuTime(meter.get());
+      opentelemetry::semconv::system::CreateAsyncDoubleMetricSystemDiskIo(meter.get());
   double_observable_counter->AddCallback(MeasurementFetcher::Fetcher, nullptr);
   for (uint32_t i = 0; i < 20; ++i)
   {

examples/grpc/client.cc

@@ -63,14 +63,13 @@ class GreeterClient
     options.kind = SpanKind::kClient;
 
     std::string span_name = "GreeterClient/Greet";
-    auto span =
-        get_tracer("grpc")->StartSpan(span_name,
-                                      {{semconv::rpc::kRpcSystem, "grpc"},
-                                       {semconv::rpc::kRpcService, "grpc-example.GreetService"},
-                                       {semconv::rpc::kRpcMethod, "Greet"},
-                                       {semconv::network::kNetworkPeerAddress, ip},
-                                       {semconv::network::kNetworkPeerPort, port}},
-                                      options);
+    auto span             = get_tracer("grpc")->StartSpan(
+        span_name,
+        {{semconv::rpc::kRpcSystemName, "grpc"},
+                     {semconv::rpc::kRpcMethod, "grpc-example.GreetService/Greet"},
+                     {semconv::network::kNetworkPeerAddress, ip},
+                     {semconv::network::kNetworkPeerPort, port}},
+        options);
 
     auto scope = get_tracer("grpc-client")->WithActiveSpan(span);
 
@@ -85,7 +84,7 @@ class GreeterClient
     if (status.ok())
     {
       span->SetStatus(StatusCode::kOk);
-      span->SetAttribute(semconv::rpc::kRpcGrpcStatusCode, status.error_code());
+      span->SetAttribute(semconv::rpc::kRpcResponseStatusCode, status.error_message());
       // Make sure to end your spans!
       span->End();
       return response.response();
@@ -94,7 +93,7 @@ class GreeterClient
     {
       std::cout << status.error_code() << ": " << status.error_message() << '\n';
       span->SetStatus(StatusCode::kError);
-      span->SetAttribute(semconv::rpc::kRpcGrpcStatusCode, status.error_code());
+      span->SetAttribute(semconv::rpc::kRpcResponseStatusCode, status.error_message());
       // Make sure to end your spans!
       span->End();
       return "RPC failed";

examples/grpc/server.cc

@@ -78,10 +78,9 @@ class GreeterServer final : public Greeter::Service
 
     std::string span_name = "GreeterService/Greet";
     auto span             = get_tracer("grpc")->StartSpan(span_name,
-                                                          {{semconv::rpc::kRpcSystem, "grpc"},
-                                                           {semconv::rpc::kRpcService, "GreeterService"},
-                                                           {semconv::rpc::kRpcMethod, "Greet"},
-                                                           {semconv::rpc::kRpcGrpcStatusCode, 0}},
+                                                          {{semconv::rpc::kRpcSystemName, "grpc"},
+                                                           {semconv::rpc::kRpcMethod, "GreeterService/Greet"},
+                                                           {semconv::rpc::kRpcResponseStatusCode, "OK"}},
                                                           options);
     auto scope            = get_tracer("grpc")->WithActiveSpan(span);