[BUILD] OTLP HTTP Exporter has build warnings in maintainer mode (#1943)

open-telemetry · Feb 3, 2023 · 32af352 · 32af352
1 parent d56a5c7
commit 32af352
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,9 +41,11 @@ jobs:
         CC: /usr/bin/gcc-12
         CXX: /usr/bin/g++-12
         GOOGLETEST_VERSION: 1.12.1
+        PROTOBUF_VERSION: 21.12
       run: |
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_ci_environment.sh
+        sudo -E ./ci/install_protobuf.sh
     - name: run cmake gcc (maintainer mode)
       env:
         CC: /usr/bin/gcc-12
@@ -64,9 +66,11 @@ jobs:
         CC: /usr/bin/clang-14
         CXX: /usr/bin/clang++-14
         GOOGLETEST_VERSION: 1.12.1
+        PROTOBUF_VERSION: 21.12
       run: |
         sudo -E ./ci/setup_cmake.sh
         sudo -E ./ci/setup_ci_environment.sh
+        sudo -E ./ci/install_protobuf.sh
     - name: run cmake clang (maintainer mode)
       env:
         CC: /usr/bin/clang-14

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,8 @@ Increment the:
 * [MAINTAINER DOC] Define and document a deprecation process,
   [DEPRECATION] Deprecate the Jaeger exporter,
   implemented by [#1923](https://github.com/open-telemetry/opentelemetry-cpp/pull/1923)
+* [BUILD] OTLP HTTP Exporter has build warnings in maintainer mode
+  [#1943](https://github.com/open-telemetry/opentelemetry-cpp/pull/1943)
 
 Deprecations:
 

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -94,6 +94,8 @@ elif [[ "$1" == "cmake.maintainer.test" ]]; then
   cd "${BUILD_DIR}"
   rm -rf *
   cmake -DCMAKE_BUILD_TYPE=Debug  \
+        -DWITH_OTLP=ON \
+        -DWITH_OTLP_HTTP=ON \
         -DWITH_PROMETHEUS=ON \
         -DWITH_EXAMPLES=ON \
         -DWITH_EXAMPLES_HTTP=ON \

diff --git a/ci/install_protobuf.sh b/ci/install_protobuf.sh
@@ -5,12 +5,38 @@
 
 set -e
 
-[ -z "${PROTOBUF_VERSION}" ] && export PROTOBUF_VERSION="3.11.4"
+[ -z "${PROTOBUF_VERSION}" ] && export PROTOBUF_VERSION="21.12"
+
+#
+# Note
+#
+# protobuf uses two release number schemes,
+# for example 3.21.12 and 21.12,
+# and both tags corresponds to the same commit:
+#
+#   commit f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c (HEAD -> release-3.21.12, tag: v3.21.12, tag: v21.12)
+#   Author: Protobuf Team Bot <protobuf-team-bot@google.com>
+#   Date:   Mon Dec 12 16:03:12 2022 -0800
+#
+#       Updating version.json and repo version numbers to: 21.12
+#
+# tag v21.12 corresponds to the 'protoc version', or repo version
+# tag v3.21.12 corresponds to the 'cpp version'
+#
+# protobuf-cpp-3.21.12.tar.gz:
+# - is provided under releases/download/v21.12
+# - is no longer provided under releases/download/v3.21.12,
+#
+# Use the "repo version number" (PROTOBUF_VERSION=21.12)
+# when calling this script
+#
+
+export CPP_PROTOBUF_VERSION="3.${PROTOBUF_VERSION}"
 
 cd /
-wget https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-cpp-${PROTOBUF_VERSION}.tar.gz
-tar zxf protobuf-cpp-${PROTOBUF_VERSION}.tar.gz --no-same-owner
-cd protobuf-${PROTOBUF_VERSION}
+wget https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-cpp-${CPP_PROTOBUF_VERSION}.tar.gz
+tar zxf protobuf-cpp-${CPP_PROTOBUF_VERSION}.tar.gz --no-same-owner
+cd protobuf-${CPP_PROTOBUF_VERSION}
 ./configure
-make && make install
+make -j $(nproc) && make install
 ldconfig
diff --git a/exporters/otlp/src/otlp_metric_utils.cc b/exporters/otlp/src/otlp_metric_utils.cc
@@ -266,7 +266,7 @@ sdk::metrics::AggregationTemporality OtlpMetricUtils::DeltaTemporalitySelector(
 }
 
 sdk::metrics::AggregationTemporality OtlpMetricUtils::CumulativeTemporalitySelector(
-    sdk::metrics::InstrumentType instrument_type) noexcept
+    sdk::metrics::InstrumentType /* instrument_type */) noexcept
 {
   return sdk::metrics::AggregationTemporality::kCumulative;
 }

diff --git a/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h b/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h
@@ -30,7 +30,8 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
   SyncMetricStorage(InstrumentDescriptor instrument_descriptor,
                     const AggregationType aggregation_type,
                     const AttributesProcessor *attributes_processor,
-                    nostd::shared_ptr<ExemplarReservoir> &&exemplar_reservoir,
+                    nostd::shared_ptr<ExemplarReservoir> &&exemplar_reservoir
+                        OPENTELEMETRY_MAYBE_UNUSED,
                     const AggregationConfig *aggregation_config)
       : instrument_descriptor_(instrument_descriptor),
         attributes_hashmap_(new AttributesHashMap()),
@@ -48,7 +49,9 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
     };
   }
 
-  void RecordLong(int64_t value, const opentelemetry::context::Context &context) noexcept override
+  void RecordLong(int64_t value,
+                  const opentelemetry::context::Context &context
+                      OPENTELEMETRY_MAYBE_UNUSED) noexcept override
   {
     if (instrument_descriptor_.value_type_ != InstrumentValueType::kLong)
     {
@@ -63,7 +66,8 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
 
   void RecordLong(int64_t value,
                   const opentelemetry::common::KeyValueIterable &attributes,
-                  const opentelemetry::context::Context &context) noexcept override
+                  const opentelemetry::context::Context &context
+                      OPENTELEMETRY_MAYBE_UNUSED) noexcept override
   {
     if (instrument_descriptor_.value_type_ != InstrumentValueType::kLong)
     {
@@ -78,7 +82,9 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
     attributes_hashmap_->GetOrSetDefault(attr, create_default_aggregation_)->Aggregate(value);
   }
 
-  void RecordDouble(double value, const opentelemetry::context::Context &context) noexcept override
+  void RecordDouble(double value,
+                    const opentelemetry::context::Context &context
+                        OPENTELEMETRY_MAYBE_UNUSED) noexcept override
   {
     if (instrument_descriptor_.value_type_ != InstrumentValueType::kDouble)
     {
@@ -93,7 +99,8 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
 
   void RecordDouble(double value,
                     const opentelemetry::common::KeyValueIterable &attributes,
-                    const opentelemetry::context::Context &context) noexcept override
+                    const opentelemetry::context::Context &context
+                        OPENTELEMETRY_MAYBE_UNUSED) noexcept override
   {
 #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
     exemplar_reservoir_->OfferMeasurement(value, attributes, context,