Skip to content

Commit

Permalink
fix ci issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dbarker committed Dec 5, 2024
1 parent b59ac58 commit 015fb00
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Increment the:
* [bazel] Update opentelemetry-proto in MODULE.bazel
[#3163](https://github.com/open-telemetry/opentelemetry-cpp/pull/3163)

* [EXPORTER] Add instrumentation scope attributes to otlp proto messages for traces and metrics
* [EXPORTER] Add instrumentation scope attributes to otlp proto messages for traces and metrics
[#3185](https://github.com/open-telemetry/opentelemetry-cpp/pull/3185)

Important changes:
Expand Down
10 changes: 5 additions & 5 deletions exporters/otlp/test/otlp_file_exporter_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class OtlpFileExporterTestPeer : public ::testing::Test
auto tracer = provider->GetTracer("scope_name", "scope_version", "scope_url");
#endif

auto parent_span = tracer->StartSpan("Test parent span");
auto parent_span = tracer->StartSpan("Test parent span");

char trace_id_hex[2 * trace_api::TraceId::kSize] = {0};

Expand All @@ -144,10 +144,10 @@ class OtlpFileExporterTestPeer : public ::testing::Test
auto check_json = nlohmann::json::parse(check_json_text, nullptr, false);
if (!check_json.is_discarded())
{
auto resource_span = *check_json["resourceSpans"].begin();
auto scope_span = *resource_span["scopeSpans"].begin();
auto scope = scope_span["scope"];
auto span = *scope_span["spans"].begin();
auto resource_span = *check_json["resourceSpans"].begin();
auto scope_span = *resource_span["scopeSpans"].begin();
auto scope = scope_span["scope"];
auto span = *scope_span["spans"].begin();

#if OPENTELEMETRY_ABI_VERSION_NO >= 2
ASSERT_EQ(1, scope["attributes"].size());
Expand Down
1 change: 0 additions & 1 deletion exporters/otlp/test/otlp_metrics_serialization_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ TEST(OtlpMetricSerializationTest, PopulateExportMetricsServiceRequest)

ASSERT_EQ(1, request_proto.resource_metrics_size());
const auto &resource_metrics_proto = request_proto.resource_metrics(0);
const auto &resource_proto = resource_metrics_proto.resource();
EXPECT_EQ("resource_schema_url", resource_metrics_proto.schema_url());

ASSERT_EQ(1, resource_metrics_proto.scope_metrics_size());
Expand Down

0 comments on commit 015fb00

Please sign in to comment.