Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Increment the:
* [CONFIGURATION] File configuration - spec stability
[#3862](https://github.com/open-telemetry/opentelemetry-cpp/pull/3862)

* [EXAMPLES] Deprecated semantic conventions used
[#3905](https://github.com/open-telemetry/opentelemetry-cpp/pull/3905)

Important changes:

* [BUILD] Revisit EventLogger deprecation
Expand Down
2 changes: 1 addition & 1 deletion examples/common/metrics_foo_library/foo_library.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
19 changes: 9 additions & 10 deletions examples/grpc/client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,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);

Expand All @@ -90,7 +89,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();
Expand All @@ -99,7 +98,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";
Expand Down
7 changes: 3 additions & 4 deletions examples/grpc/server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,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);

Expand Down
Loading