Merge branch 'main' into fix_1998

open-telemetry · Apr 14, 2023 · 33a625e · 33a625e
2 parents 1d20c56 + 7887d32
commit 33a625e
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,22 +15,64 @@ Increment the:
 
 ## [Unreleased]
 
-* [RESOURCE SDK] Fix schema URL precedence bug in `Resource::Merge`.
-  [#2036](https://github.com/open-telemetry/opentelemetry-cpp/pull/2036)
-* [EXPORTER] GRPC endpoint scheme should take precedence over OTEL_EXPORTER_OTLP_TRACES_INSECURE
-  [#2060](https://github.com/open-telemetry/opentelemetry-cpp/pull/2060)
-* [BUILD] Restore detfault value of `OPENTELEMETRY_INSTALL` to `ON` when it's on
-  top level.[#2062](https://github.com/open-telemetry/opentelemetry-cpp/pull/2062)
-* [EXPORTERS]Add `ForceFlush` for `LogRecordExporter` and `SpanExporter`
-  [#2000](https://github.com/open-telemetry/opentelemetry-cpp/pull/2000)
-* [SEMANTIC CONVENTIONS] Upgrade to version 1.19.0
-  [#2017](https://github.com/open-telemetry/opentelemetry-cpp/pull/2017)
+Deprecations:
+
+* The Jaeger Exporter is deprecated, see [DEPRECATED](./DEPRECATED.md) for details.
+
+## [1.9.0] 2023-04-12
+
+* [CI] Make build environment parallel (Windows)
+  [#2080](https://github.com/open-telemetry/opentelemetry-cpp/pull/2080)
+* [CI] Make build environment parallel (Linux)
+  [#2076](https://github.com/open-telemetry/opentelemetry-cpp/pull/2076)
+* [CI] Remove separate run of metrics ostream example
+  [#2030](https://github.com/open-telemetry/opentelemetry-cpp/pull/2030)
+
+* [BUILD] Include directory path added for Zipkin exporter example
+  [#2069](https://github.com/open-telemetry/opentelemetry-cpp/pull/2069)
+* [BUILD] Ignore more warning in generated protobuf files
+  [#2067](https://github.com/open-telemetry/opentelemetry-cpp/pull/2067)
+* [BUILD] Clean warnings in ETW exporters
+  [#2063](https://github.com/open-telemetry/opentelemetry-cpp/pull/2063)
+* [BUILD] Fix default value of OPENTELEMETRY_INSTALL_default
+  [#2062](https://github.com/open-telemetry/opentelemetry-cpp/pull/2062)
+
 * [SEMANTIC CONVENTIONS] Upgrade to version 1.20.0
   [#2088](https://github.com/open-telemetry/opentelemetry-cpp/pull/2088)
+* [SEMANTIC CONVENTIONS] Upgrade to version 1.19.0
+  [#2017](https://github.com/open-telemetry/opentelemetry-cpp/pull/2017)
+
+* [API] Checking indices before dereference in string utils
+  [#2040](https://github.com/open-telemetry/opentelemetry-cpp/pull/2040)
+* [API] Export factory class of log provider
+  [#2041](https://github.com/open-telemetry/opentelemetry-cpp/pull/2041)
+
+* [SDK] Implement Forceflush for Periodic Metric Reader
+  [#2064](https://github.com/open-telemetry/opentelemetry-cpp/pull/2064)
+* [SDK] Add `ForceFlush` for all `LogRecordExporter` and `SpanExporter`
+  [#2000](https://github.com/open-telemetry/opentelemetry-cpp/pull/2000)
+* [SDK] Fix schema URL precedence bug in `Resource::Merge`
+  [#2036](https://github.com/open-telemetry/opentelemetry-cpp/pull/2036)
+* [SDK] Use sdk_start_ts for MetricData start_ts for instruments having
+  cumulative aggregation temporality.
+  [#2086](https://github.com/open-telemetry/opentelemetry-cpp/pull/2086)
+
 * [EXPORTER] Add OTLP HTTP SSL support
   [#1793](https://github.com/open-telemetry/opentelemetry-cpp/pull/1793)
-* [METRICS SDK] Use sdk_start_ts for MetricData start_ts for instruments having
-  cumulative aggregation temporality. [#2086](https://github.com/open-telemetry/opentelemetry-cpp/pull/2086)
+* [EXPORTER] GRPC endpoint scheme should take precedence over OTEL_EXPORTER_OTLP_TRACES_INSECURE
+  [#2060](https://github.com/open-telemetry/opentelemetry-cpp/pull/2060)
+
+* [EXAMPLES] Remove unused 'alerting' section from prometheus.yml in examples
+  [#2055](https://github.com/open-telemetry/opentelemetry-cpp/pull/2055)
+* [EXAMPLES] Fix view names in Prometheus example
+  [#2034](https://github.com/open-telemetry/opentelemetry-cpp/pull/2034)
+
+* [DOC] Fix some docs typo
+  [#2057](https://github.com/open-telemetry/opentelemetry-cpp/pull/2057)
+* [DOC] Update OpenTracing shim README.md
+  [#2028](https://github.com/open-telemetry/opentelemetry-cpp/pull/2028)
+* [DOC] INSTALL doc clarifications
+  [#2078](https://github.com/open-telemetry/opentelemetry-cpp/pull/2078)
 
 Important changes:
 
@@ -54,12 +96,16 @@ Important changes:
     * As a result, a behavior change for GRPC SSL is possible,
       because the endpoint scheme now takes precedence.
       Please verify configuration settings for the GRPC endpoint.
-* [EXPORTERS]Add `ForceFlush` for `LogRecordExporter` and `SpanExporter`
+* [SDK] Add `ForceFlush` for all `LogRecordExporter` and `SpanExporter`
   [#2000](https://github.com/open-telemetry/opentelemetry-cpp/pull/2000)
   * `LogRecordExporter` and `SpanExporter` add a new virtual function
     `ForceFlush`, and if users implement any customized `LogRecordExporter` and
-    `SpanExporter`, they should also implement this function.There should be no
-    influence if users only use factory to create exporters.
+    `SpanExporter`, they should also implement this function.
+    There should be no impact if users only use factory to create exporters.
+
+Deprecations:
+
+* The Jaeger Exporter is deprecated, see [DEPRECATED](./DEPRECATED.md) for details.
 
 ## [1.8.3] 2023-03-06
 

diff --git a/DEPRECATED.md b/DEPRECATED.md
@@ -108,7 +108,7 @@ exporter (both OTLP HTTP and OTLP GRPC are supported).
 
 #### Planned removal (Jaeger)
 
-* Date: After April 1st, 2023
+* Date: July, 2023
 
 ## [Documentation]
 

diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h
@@ -7,10 +7,10 @@
 #include "opentelemetry/detail/preprocessor.h"
 
 #define OPENTELEMETRY_ABI_VERSION_NO 1
-#define OPENTELEMETRY_VERSION "1.8.3"
+#define OPENTELEMETRY_VERSION "1.9.0"
 #define OPENTELEMETRY_VERSION_MAJOR 1
-#define OPENTELEMETRY_VERSION_MINOR 8
-#define OPENTELEMETRY_VERSION_PATCH 3
+#define OPENTELEMETRY_VERSION_MINOR 9
+#define OPENTELEMETRY_VERSION_PATCH 0
 
 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
 

diff --git a/buildscripts/pre-commit b/buildscripts/pre-commit
@@ -43,7 +43,10 @@ short_version="${major}.${minor}.${patch}"
 full_version="${short_version}-${pre_release}-${build_metadata}-${count_new_commits}-${branch}-${latest_commit_hash}"
 
 # Update api version.h
-sed -i "/^\#define OPENTELEMETRY_VERSION/c\#define OPENTELEMETRY_VERSION \"${short_version}\""  "$(pwd)/api/include/opentelemetry/version.h"
+sed -i "/^\#define OPENTELEMETRY_VERSION /c\#define OPENTELEMETRY_VERSION \"${short_version}\""  "$(pwd)/api/include/opentelemetry/version.h"
+sed -i "/^\#define OPENTELEMETRY_VERSION_MAJOR /c\#define OPENTELEMETRY_VERSION_MAJOR ${major}"  "$(pwd)/api/include/opentelemetry/version.h"
+sed -i "/^\#define OPENTELEMETRY_VERSION_MINOR /c\#define OPENTELEMETRY_VERSION_MINOR ${minor}"  "$(pwd)/api/include/opentelemetry/version.h"
+sed -i "/^\#define OPENTELEMETRY_VERSION_PATCH /c\#define OPENTELEMETRY_VERSION_PATCH ${patch}"  "$(pwd)/api/include/opentelemetry/version.h"
 git add "$(pwd)/api/include/opentelemetry/version.h"
 
 # Update sdk version.cc

diff --git a/docs/public/conf.py b/docs/public/conf.py
@@ -24,7 +24,7 @@
 author = 'OpenTelemetry authors'
 
 # The full version, including alpha/beta/rc tags
-release = "1.8.3"
+release = "1.9.0"
 
 # Run sphinx on subprojects and copy output
 # -----------------------------------------

diff --git a/sdk/include/opentelemetry/sdk/version/version.h b/sdk/include/opentelemetry/sdk/version/version.h
@@ -5,7 +5,7 @@
 
 #include "opentelemetry/detail/preprocessor.h"
 
-#define OPENTELEMETRY_SDK_VERSION "1.8.3"
+#define OPENTELEMETRY_SDK_VERSION "1.9.0"
 
 #include "opentelemetry/version.h"
 

diff --git a/sdk/src/version/version.cc b/sdk/src/version/version.cc
@@ -12,17 +12,17 @@ namespace sdk
 namespace version
 {
 const int major_version     = 1;
-const int minor_version     = 8;
-const int patch_version     = 3;
+const int minor_version     = 9;
+const int patch_version     = 0;
 const char *pre_release     = "NONE";
 const char *build_metadata  = "NONE";
-const int count_new_commits = 43;
-const char *branch          = "pre_release_1.8.3";
-const char *commit_hash     = "d011e407306991be4f0580b59d5975aecdc86aca";
-const char *short_version   = "1.8.3";
+const int count_new_commits = 26;
+const char *branch          = "pre_release_1.9.0";
+const char *commit_hash     = "a9876353337d5de74323b8935479618c9b422d09";
+const char *short_version   = "1.9.0";
 const char *full_version =
-    "1.8.2-NONE-NONE-43-pre_release_1.8.3-d011e407306991be4f0580b59d5975aecdc86aca";
-const char *build_date = "Tue Mar  7 21:15:06 UTC 2023";
+    "1.9.0-NONE-NONE-26-pre_release_1.9.0-a9876353337d5de74323b8935479618c9b422d09";
+const char *build_date = "Wed 12 Apr 2023 03:32:28 PM UTC";
 }  // namespace version
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE