Skip to content

Commit 13f90d6

Browse files
owentowent
committed
Merge remote-tracking branch 'github/main' into fix_lifetime_in_log_record
# Conflicts: # CHANGELOG.md
2 parents afde1dd + 7801cd9 commit 13f90d6

File tree

276 files changed

+17873
-1451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+17873
-1451
lines changed

‎.devcontainer/Dockerfile.conan

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Copyright The OpenTelemetry Authors
2+
# SPDX-License-Identifier: Apache-2.0
3+
FROM ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02
4+
5+
RUN apt update && apt install -y \
6+
build-essential \
7+
ca-certificates \
8+
wget \
9+
cmake \
10+
git \
11+
sudo \
12+
nano \
13+
pkg-config \
14+
ninja-build \
15+
clang-format \
16+
clang-tidy \
17+
autoconf \
18+
automake \
19+
libtool \
20+
python3-pip
21+
22+
RUN pip install "conan==2.15.1" --break-system-packages
23+
24+
ARG USER_UID=1000
25+
ARG USER_GID=1000
26+
ARG USER_NAME=devuser
27+
ENV USER_NAME=devuser
28+
ENV USER_UID=${USER_UID}
29+
ENV USER_GID=${USER_GID}
30+
ENV INSTALL_PACKAGES=
31+
ENV IS_CONTAINER_BUILD=true
32+
33+
COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
34+
RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
35+
USER devuser
36+
37+
RUN conan profile detect --force
38+
39+
ARG CONAN_FILE=conanfile_stable.txt
40+
ARG CONAN_BUILD_TYPE=Debug
41+
ARG CXX_STANDARD=17
42+
WORKDIR /home/devuser/conan
43+
COPY ./install/conan/ .
44+
45+
RUN conan install ./${CONAN_FILE} --build=missing -s build_type=${CONAN_BUILD_TYPE}
46+
ENV CMAKE_TOOLCHAIN_FILE=/home/devuser/conan/build/${CONAN_BUILD_TYPE}/generators/conan_toolchain.cmake
47+
ENV CXX_STANDARD=${CXX_STANDARD}
48+
ENV BUILD_TYPE=${CONAN_BUILD_TYPE}
49+
ENV CONAN_FILE=${CONAN_FILE}
50+
51+
WORKDIR /workspaces/opentelemetry-cpp
52+
53+
ENTRYPOINT []
54+
55+
CMD ["/bin/bash"]

‎.devcontainer/Dockerfile.dev

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ ARG USER_GID=1000
88
ARG INSTALL_PACKAGES=
99

1010
ARG CXX_STANDARD=17
11+
ARG CMAKE_VERSION=3.31.6
1112
ARG ABSEIL_CPP_VERSION=20230125.3
1213
ARG PROTOBUF_VERSION=23.3
1314
ARG GRPC_VERSION=v1.55.0
1415

1516
ENV CXX_STANDARD=${CXX_STANDARD}
17+
ENV CMAKE_VERSION=${CMAKE_VERSION}
1618
ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
1719
ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
1820
ENV GRPC_VERSION=${GRPC_VERSION}
@@ -30,7 +32,7 @@ RUN cd /opt/ci && bash setup_ci_environment.sh
3032
RUN cd /opt && bash ci/setup_googletest.sh \
3133
&& bash ci/install_abseil.sh \
3234
&& bash ci/install_protobuf.sh \
33-
&& bash ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil
35+
&& bash ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
3436

3537
ADD https://github.com/bazelbuild/bazelisk/releases/download/v1.22.1/bazelisk-linux-amd64 /usr/local/bin
3638

@@ -45,7 +47,7 @@ ENV IS_CONTAINER_BUILD=true
4547

4648
COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
4749
RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
48-
RUN apt install -y npm && npm install -g markdownlint-cli
50+
RUN apt install -y npm && npm install -g markdownlint-cli@0.44.0
4951

5052
USER devuser
5153

‎.devcontainer/README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
Customize your dev container using build arguments (for direct Docker builds) or
44
environment variables (for evaluation in `devcontainer.json`).
55

6+
* **CMake version:**
7+
The version of cmake to install. (Default: 3.31.6)
8+
* Docker ARG:
9+
`CMAKE_VERSION`
10+
* Host Environment Variable:
11+
`OTEL_CPP_DEVCONTAINER_CMAKE_VERSION`
12+
613
* **CXX standard:**
714
This is the C++ standard to build from (eg: 17, 20, ...). (Default: 17)
815
* Docker ARG:
@@ -12,7 +19,7 @@ environment variables (for evaluation in `devcontainer.json`).
1219

1320
* **abseil-cpp version:**
1421
This is the version of abseil-cpp that will be used to build protobuf, gRPC,
15-
and opentelemetry-cpp (when WITH_ABSEIL is set).
22+
and opentelemetry-cpp.
1623
* Docker ARG:
1724
`ABSEIL_CPP_VERSION`
1825
* Host Environment Variable:

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"USER_UID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_UID:1000}",
1212
"USER_GID": "${localEnv:OTEL_CPP_DEVCONTAINER_USER_GID:1000}",
1313
"INSTALL_PACKAGES": "${localEnv:OTEL_CPP_DEVCONTAINER_INSTALL_PACKAGES:}",
14+
"CMAKE_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_CMAKE_VERSION:3.31.6}",
1415
"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}",
1516
"GRPC_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_GRPC_VERSION:v1.55.0}",
1617
"PROTOBUF_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION:23.3}",

‎.github/workflows/benchmark.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ jobs:
1313
name: Run OpenTelemetry-cpp benchmarks
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v4
16+
- name: Harden the runner (Audit all outbound calls)
17+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
18+
with:
19+
egress-policy: audit
20+
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1722
with:
1823
submodules: 'recursive'
1924
- name: Mount Bazel Cache
20-
uses: actions/cache@v4
25+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
2126
env:
2227
cache-name: bazel_cache
2328
with:
@@ -35,7 +40,7 @@ jobs:
3540
mv api-benchmark_result.json benchmarks
3641
mv sdk-benchmark_result.json benchmarks
3742
mv exporters-benchmark_result.json benchmarks
38-
- uses: actions/upload-artifact@v4
43+
- uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 # main March 2025
3944
with:
4045
name: benchmark_results
4146
path: benchmarks
@@ -47,8 +52,13 @@ jobs:
4752
name: Store benchmark result
4853
runs-on: ubuntu-latest
4954
steps:
50-
- uses: actions/checkout@v4
51-
- uses: actions/download-artifact@master
55+
- name: Harden the runner (Audit all outbound calls)
56+
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
57+
with:
58+
egress-policy: audit
59+
60+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
61+
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # main March 2025
5262
with:
5363
name: benchmark_results
5464
path: benchmarks
@@ -57,7 +67,7 @@ jobs:
5767
run: |
5868
cat benchmarks/*
5969
- name: Push benchmark result
60-
uses: benchmark-action/github-action-benchmark@v1
70+
uses: benchmark-action/github-action-benchmark@d48d326b4ca9ba73ca0cd0d59f108f9e02a381c7 # v1.20.4
6171
with:
6272
name: OpenTelemetry-cpp ${{ matrix.components }} Benchmark
6373
tool: 'googlecpp'

0 commit comments

Comments
 (0)