Skip to content

Commit f0ac99e

Browse files
lalitbyxue
authored andcommitted
[Old Metrics Cleanup] Remove old metric from GitHub CI (open-telemetry#1733)
1 parent 5407b9d commit f0ac99e

4 files changed

Lines changed: 3 additions & 59 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,6 @@ jobs:
6969
- name: run tests
7070
run: ./ci/do_ci.ps1 cmake.maintainer.test
7171

72-
cmake_deprecated_metrics_test:
73-
name: CMake test (without otlp-exporter and with deprecated metrics)
74-
runs-on: ubuntu-latest
75-
steps:
76-
- uses: actions/checkout@v3
77-
with:
78-
submodules: 'recursive'
79-
- name: setup
80-
run: |
81-
sudo ./ci/setup_cmake.sh
82-
sudo ./ci/setup_ci_environment.sh
83-
- name: run cmake tests (without otlp-exporter)
84-
run: |
85-
sudo ./ci/setup_thrift.sh
86-
./ci/do_ci.sh cmake.deprecated_metrics.test
87-
8872
cmake_with_async_export_test:
8973
name: CMake test (without otlp-exporter and with async export)
9074
runs-on: ubuntu-latest
@@ -228,28 +212,6 @@ jobs:
228212
- name: run tests
229213
run: ./ci/do_ci.sh bazel.test
230214

231-
bazel_deprecated_metrics_test:
232-
name: Bazel deprecated metrics
233-
runs-on: ubuntu-latest
234-
steps:
235-
- uses: actions/checkout@v3
236-
with:
237-
submodules: 'recursive'
238-
- name: Mount Bazel Cache
239-
uses: actions/cache@v3
240-
env:
241-
cache-name: bazel_cache
242-
with:
243-
path: /home/runner/.cache/bazel
244-
key: bazel_test
245-
- name: setup
246-
run: |
247-
sudo ./ci/setup_thrift.sh dependencies_only
248-
sudo ./ci/setup_ci_environment.sh
249-
sudo ./ci/install_bazelisk.sh
250-
- name: run tests
251-
run: ./ci/do_ci.sh bazel.deprecated_metrics.test
252-
253215
bazel_test_async:
254216
name: Bazel with async export
255217
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ Increment the:
4848
=======
4949
* [LOGS SDK] Rename LogProcessor and LogExporter to LogRecordProcessor and LogRecordExporter
5050
[#1727](https://github.com/open-telemetry/opentelemetry-cpp/pull/1727)
51+
* [METRICS SDK] - Remove old metrics from Github CI
52+
[#1733](https://github.com/open-telemetry/opentelemetry-cpp/pull/1733)
5153

5254
>>>>>>> 7634edf4 ([Logs SDK] LogProcessor, LogExporter changes (#1727))
5355
## [1.7.0] 2022-10-28

ci/do_ci.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $action = $args[0]
55

66
$SRC_DIR = (Get-Item -Path ".\").FullName
77

8-
$BAZEL_OPTIONS = "--copt=-DENABLE_METRICS_PREVIEW --copt=-DENABLE_LOGS_PREVIEW --copt=-DENABLE_ASYNC_EXPORT"
8+
$BAZEL_OPTIONS = "--copt=-DENABLE_LOGS_PREVIEW --copt=-DENABLE_ASYNC_EXPORT"
99
$BAZEL_TEST_OPTIONS = "$BAZEL_OPTIONS --test_output=errors"
1010

1111
if (!(test-path build)) {

ci/do_ci.sh

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -124,22 +124,6 @@ elif [[ "$1" == "cmake.with_async_export.test" ]]; then
124124
make
125125
make test
126126
exit 0
127-
elif [[ "$1" == "cmake.deprecated_metrics.test" ]]; then
128-
cd "${BUILD_DIR}"
129-
rm -rf *
130-
cmake -DCMAKE_BUILD_TYPE=Debug \
131-
-DWITH_PROMETHEUS=ON \
132-
-DWITH_ZIPKIN=OFF \
133-
-DWITH_JAEGER=OFF \
134-
-DWITH_ELASTICSEARCH=OFF \
135-
-DWITH_METRICS_PREVIEW=ON \
136-
-DWITH_LOGS_PREVIEW=OFF \
137-
-DCMAKE_CXX_FLAGS="-Werror" \
138-
-DWITH_ASYNC_EXPORT_PREVIEW=ON \
139-
"${SRC_DIR}"
140-
make
141-
make test
142-
exit 0
143127
elif [[ "$1" == "cmake.abseil.test" ]]; then
144128
cd "${BUILD_DIR}"
145129
rm -rf *
@@ -276,10 +260,6 @@ elif [[ "$1" == "bazel.test" ]]; then
276260
bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS //...
277261
bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS //...
278262
exit 0
279-
elif [[ "$1" == "bazel.deprecated_metrics.test" ]]; then
280-
bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS --copt=-DENABLE_METRICS_PREVIEW //...
281-
bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS --copt=-DENABLE_METRICS_PREVIEW //...
282-
exit 0
283263
elif [[ "$1" == "bazel.with_async_export.test" ]]; then
284264
bazel $BAZEL_STARTUP_OPTIONS build $BAZEL_OPTIONS_ASYNC //...
285265
bazel $BAZEL_STARTUP_OPTIONS test $BAZEL_TEST_OPTIONS_ASYNC //...

0 commit comments

Comments
 (0)