Merge branch 'main' into opentracing-shim

open-telemetry · Mar 3, 2023 · ac8dc8f · ac8dc8f
2 parents 59108e4 + 9a5bb8d
commit ac8dc8f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/buildscripts/pre-commit b/buildscripts/pre-commit
@@ -61,18 +61,18 @@ namespace sdk
 {
 namespace version
 {
-const int OPENTELEMETRY_SDK_MAJOR_VERSION = ${major};
-const int OPENTELEMETRY_SDK_MINOR_VERSION = ${minor};
-const int OPENTELEMETRY_SDK_PATCH_VERSION = ${patch};
-const char* OPENTELEMETRY_SDK_PRE_RELEASE = "${pre_release}";
-const char* OPENTELEMETRY_SDK_BUILD_METADATA = "${build_metadata}";
-const int OPENTELEMETRY_SDK_COUNT_NEW_COMMITS = ${count_new_commits};
-const char* OPENTELEMETRY_SDK_BRANCH = "${branch}";
-const char* OPENTELEMETRY_SDK_COMMIT_HASH = "${latest_commit_hash}";
-const char* OPENTELEMETRY_SDK_SHORT_VERSION = "${short_version}";
-const char* OPENTELEMETRY_SDK_FULL_VERSION =
+const int major_version = ${major};
+const int minor_version = ${minor};
+const int patch_version = ${patch};
+const char* pre_release = "${pre_release}";
+const char* build_metadata = "${build_metadata}";
+const int count_new_commits = ${count_new_commits};
+const char* branch = "${branch}";
+const char* commit_hash = "${latest_commit_hash}";
+const char* short_version = "${short_version}";
+const char* full_version =
     "${full_version}";
-const char* OPENTELEMETRY_SDK_BUILD_DATE = "$(date -u)";
+const char* build_date = "$(date -u)";
 }  // namespace version
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE

diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h
@@ -14,17 +14,17 @@ namespace sdk
 {
 namespace version
 {
-extern const int OPENTELEMETRY_SDK_MAJOR_VERSION;
-extern const int OPENTELEMETRY_SDK_MINOR_VERSION;
-extern const int OPENTELEMETRY_SDK_PATCH_VERSION;
-extern const char *OPENTELEMETRY_SDK_PRE_RELEASE;
-extern const char *OPENTELEMETRY_SDK_BUILD_METADATA;
-extern const int OPENTELEMETRY_SDK_COUNT_NEW_COMMITS;
-extern const char *OPENTELEMETRY_SDK_BRANCH;
-extern const char *OPENTELEMETRY_SDK_COMMIT_HASH;
-extern const char *OPENTELEMETRY_SDK_SHORT_VERSION;
-extern const char *OPENTELEMETRY_SDK_FULL_VERSION;
-extern const char *OPENTELEMETRY_SDK_BUILD_DATE;
+extern const int major_version;
+extern const int minor_version;
+extern const int patch_version;
+extern const char *pre_release;
+extern const char *build_metadata;
+extern const int count_new_commits;
+extern const char *branch;
+extern const char *commit_hash;
+extern const char *short_version;
+extern const char *full_version;
+extern const char *build_date;
 }  // namespace version
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc
@@ -11,18 +11,18 @@ namespace sdk
 {
 namespace version
 {
-const int OPENTELEMETRY_SDK_MAJOR_VERSION     = 1;
-const int OPENTELEMETRY_SDK_MINOR_VERSION     = 8;
-const int OPENTELEMETRY_SDK_PATCH_VERSION     = 2;
-const char *OPENTELEMETRY_SDK_PRE_RELEASE     = "NONE";
-const char *OPENTELEMETRY_SDK_BUILD_METADATA  = "NONE";
-const int OPENTELEMETRY_SDK_COUNT_NEW_COMMITS = 37;
-const char *OPENTELEMETRY_SDK_BRANCH          = "pre_release_1.8.2";
-const char *OPENTELEMETRY_SDK_COMMIT_HASH     = "435ce60f233b6718aaa04bb7068dd641b536299b";
-const char *OPENTELEMETRY_SDK_SHORT_VERSION   = "1.8.2";
-const char *OPENTELEMETRY_SDK_FULL_VERSION =
+const int major_version     = 1;
+const int minor_version     = 8;
+const int patch_version     = 2;
+const char *pre_release     = "NONE";
+const char *build_metadata  = "NONE";
+const int count_new_commits = 37;
+const char *branch          = "pre_release_1.8.2";
+const char *commit_hash     = "435ce60f233b6718aaa04bb7068dd641b536299b";
+const char *short_version   = "1.8.2";
+const char *full_version =
     "1.8.2-NONE-NONE-37-pre_release_1.8.2-435ce60f233b6718aaa04bb7068dd641b536299b";
-const char *OPENTELEMETRY_SDK_BUILD_DATE = "Tue 31 Jan 2023 04:01:10 PM UTC";
+const char *build_date = "Tue 31 Jan 2023 04:01:10 PM UTC";
 }  // namespace version
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE