Skip to content

[pull] main from open-telemetry:main #313

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

Merged
merged 2 commits into from
Dec 19, 2024
Merged

[pull] main from open-telemetry:main #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
807d610
[TEST] Added support for SELINUX in functional tests (#3212)
marcalff Dec 19, 2024
4998eb1
[EDITORIAL] fix changelog entry for PR 3185 (#3217)
dbarker Dec 19, 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
6 changes: 3 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ Increment the:
* [SDK] Fix instrumentation scope attributes evaluated in equal method
[#3214](https://github.com/open-telemetry/opentelemetry-cpp/pull/3214)

* [EXPORTER] Fix scope attributes missing from otlp traces metrics
[#3185](https://github.com/open-telemetry/opentelemetry-cpp/pull/3185)

## [1.18 2024-11-25]

* [EXPORTER] Fix crash in ElasticsearchLogRecordExporter
Expand Down Expand Up @@ -155,9 +158,6 @@ Increment the:
* [bazel] Update opentelemetry-proto in MODULE.bazel
[#3163](https://github.com/open-telemetry/opentelemetry-cpp/pull/3163)

* [EXPORTER] Fix scope attributes missing from otlp traces metrics
[#3185](https://github.com/open-telemetry/opentelemetry-cpp/pull/3185)

Important changes:

* [API] Jaeger Propagator should not be deprecated
Expand Down
23 changes: 18 additions & 5 deletions functional/otlp/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@ export CERT_DIR=../cert

export TEST_BIN_DIR=${BUILD_DIR}/functional/otlp/

# SELINUX
# https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label

USE_MOUNT_OPTION=""

if [ -x "$(command -v getenforce)" ]; then
SELINUXSTATUS=$(getenforce);
if [ "${SELINUXSTATUS}" == "Enforcing" ]; then
echo "Detected SELINUX"
USE_MOUNT_OPTION=":z"
fi;
fi

${TEST_BIN_DIR}/func_otlp_http --list > test_list.txt

#
Expand Down Expand Up @@ -44,7 +57,7 @@ echo ""


docker run -d \
-v `pwd`/otel-docker-config-http.yaml:/otel-cpp/otel-config.yaml \
-v `pwd`/otel-docker-config-http.yaml:/otel-cpp/otel-config.yaml${USE_MOUNT_OPTION} \
-p 4318:4318 \
--name otelcpp-test-http \
otelcpp-func-test
Expand Down Expand Up @@ -74,10 +87,10 @@ echo "###############################################################"
echo ""

docker run -d \
-v `pwd`/otel-docker-config-https.yaml:/otel-cpp/otel-config.yaml \
-v `pwd`/../cert/ca.pem:/otel-cpp/ca.pem \
-v `pwd`/../cert/server_cert.pem:/otel-cpp/server_cert.pem \
-v `pwd`/../cert/server_cert-key.pem:/otel-cpp/server_cert-key.pem \
-v `pwd`/otel-docker-config-https.yaml:/otel-cpp/otel-config.yaml${USE_MOUNT_OPTION} \
-v `pwd`/../cert/ca.pem:/otel-cpp/ca.pem${USE_MOUNT_OPTION} \
-v `pwd`/../cert/server_cert.pem:/otel-cpp/server_cert.pem${USE_MOUNT_OPTION} \
-v `pwd`/../cert/server_cert-key.pem:/otel-cpp/server_cert-key.pem${USE_MOUNT_OPTION} \
-p 4318:4318 \
--name otelcpp-test-https \
otelcpp-func-test
Expand Down
Loading