8000 [BUILD] Use -dev versions in main branch by marcalff · Pull Request #3609 · open-telemetry/opentelemetry-cpp · GitHub
[go: up one dir, main page]

Skip to content

Conversation

marcalff
Copy link
Member
@marcalff marcalff commented Aug 25, 2025

Fixes #3583

Changes

Please provide a brief description of the changes here.

For significant contributions please make sure you have completed the following items:

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed

@marcalff marcalff requested a review from a team as a code owner August 25, 2025 21:49
Copy link
codecov bot commented Aug 25, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 90.03%. Comparing base (096454f) to head (9fb44c5).

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #3609   +/-   ##
=======================================
  Coverage   90.03%   90.03%           
=======================================
  Files         220      220           
  Lines        7069     7069           
=======================================
  Hits         6364     6364           
  Misses        705      705           
Files with missing lines Coverage Δ
exporters/ostream/test/ostream_log_test.cc 96.45% <100.00%> (ø)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@marcalff marcalff added the pr:please-review This PR is ready for review label Aug 25, 2025

std::string actual = OPENTELEMETRY_VERSION;
EXPECT_EQ(actual, expected);
/* OPENTELEMETRY_VERSION may contain a -dev suffix */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check the exact suffix?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The -dev convention for main is arbitrary, we can potentially have also -rc, -rfc or anything, so the -dev part can not be hardcoded in the unit test itself.

There is no #define OPENTELEMETRY_VERSION_SUFFIX "-dev" either (and I don't think we should add it), so there is nothing to compare the suffix against to validate the full version string.

This code change in the unit test is sufficient to pass with both "1.23.0" and "1.23.0-dev".

Copy link
Member
@dbarker dbarker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good with one minor change - the version and suffix at the top of the main CMakeLists.txt file need to be updated

@marcalff marcalff merged commit 6540d19 into open-telemetry:main Aug 29, 2025
66 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr:please-review This PR is ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update release process to bump main branch to a dev version number
4 participants
0