Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch release v1.14.2 #2563

Merged
merged 7 commits into from
Feb 27, 2024
Merged

Patch release v1.14.2 #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83fad88
Merge pull request #294 from open-telemetry/main
lalitb Feb 27, 2024
2561151
Merge branch 'open-telemetry:main' into main
lalitb Feb 27, 2024
23be948
rel v1.15.0
lalitb Feb 27, 2024
845a0a0
conf.py release update
lalitb Feb 27, 2024
1b53e05
make it a patch release
lalitb Feb 27, 2024
73f046d
Merge branch 'open-telemetry:main' into main
lalitb Feb 27, 2024
992c806
Merge branch 'main' of github.com:lalitb/opentelemetry-cpp into rel-v…
lalitb Feb 27, 2024
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ Increment the:

## [Unreleased]

## [1.14.2] 2024-02-27

* [SDK] Fix observable attributes drop
[#2557](https://github.com/open-telemetry/opentelemetry-cpp/pull/2557)

## [1.14.1] 2024-02-23

* [SDK] Restore Recordable API compatibility with versions < 1.14.0
Expand Down
4 changes: 2 additions & 2 deletions api/include/opentelemetry/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
# define OPENTELEMETRY_ABI_VERSION_NO 1
#endif

#define OPENTELEMETRY_VERSION "1.14.1"
#define OPENTELEMETRY_VERSION "1.14.2"
#define OPENTELEMETRY_VERSION_MAJOR 1
#define OPENTELEMETRY_VERSION_MINOR 14
#define OPENTELEMETRY_VERSION_PATCH 1
#define OPENTELEMETRY_VERSION_PATCH 2

#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)

Expand Down
2 changes: 1 addition & 1 deletion docs/public/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = 'OpenTelemetry authors'

# The full version, including alpha/beta/rc tags
release = "1.14.1"
release = "1.14.2"

# Run sphinx on subprojects and copy output
# -----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/version/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "opentelemetry/detail/preprocessor.h"

#define OPENTELEMETRY_SDK_VERSION "1.14.1"
#define OPENTELEMETRY_SDK_VERSION "1.14.2"

#include "opentelemetry/version.h"

Expand Down
8 changes: 4 additions & 4 deletions sdk/src/version/version.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ namespace version
{
const int major_version = 1;
const int minor_version = 14;
const int patch_version = 1;
const int patch_version = 2;
const char *pre_release = "NONE";
const char *build_metadata = "NONE";
const char *short_version = "1.14.1";
const char *full_version = "1.14.1-NONE-NONE";
const char *build_date = "Fri Feb 23 21:04:34 UTC 2024";
const char *short_version = "1.14.2";
const char *full_version = "1.14.2-NONE-NONE";
const char *build_date = "Tue Feb 27 18:25:51 UTC 2024";
} // namespace version
} // namespace sdk
OPENTELEMETRY_END_NAMESPACE