Skip to content

Commit 19d7f02

Browse files
authored
Merge branch 'main' into add_dll_build_to_ci_with_stl
2 parents 283643a + b00958b commit 19d7f02

File tree

687 files changed

+30047
-14489
lines changed

Some content is hidden

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

687 files changed

+30047
-14489
lines changed

.devcontainer/Dockerfile.dev

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,22 @@ ARG USER_GID=1000
88
ARG INSTALL_PACKAGES=
99

1010
ARG CXX_STANDARD=17
11-
ARG CMAKE_VERSION=3.31.6
12-
ARG ABSEIL_CPP_VERSION=20230125.3
13-
ARG PROTOBUF_VERSION=23.3
14-
ARG GRPC_VERSION=v1.55.0
1511

1612
ENV CXX_STANDARD=${CXX_STANDARD}
17-
ENV CMAKE_VERSION=${CMAKE_VERSION}
18-
ENV ABSEIL_CPP_VERSION=${ABSEIL_CPP_VERSION}
19-
ENV PROTOBUF_VERSION=${PROTOBUF_VERSION}
20-
ENV GRPC_VERSION=${GRPC_VERSION}
2113

2214
COPY ci /opt/ci
2315

2416
RUN apt update && apt install -y wget \
25-
ninja-build \
26-
libcurl4-openssl-dev \
27-
clang-tidy \
28-
shellcheck
17+
ninja-build \
18+
llvm-dev \
19+
libclang-dev \
20+
clang-tidy \
21+
shellcheck \
22+
sudo \
23+
cmake
2924

30-
RUN cd /opt/ci && bash setup_cmake.sh
3125
RUN cd /opt/ci && bash setup_ci_environment.sh
32-
RUN cd /opt && bash ci/setup_googletest.sh \
33-
&& bash ci/install_abseil.sh \
34-
&& bash ci/install_protobuf.sh \
35-
&& bash ci/setup_grpc.sh -r $GRPC_VERSION -s $CXX_STANDARD -p protobuf -p abseil-cpp
26+
RUN cd /opt/ci && bash install_iwyu.sh
3627

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

@@ -45,14 +36,17 @@ ENV USER_UID=${USER_UID}
4536
ENV USER_GID=${USER_GID}
4637
ENV IS_CONTAINER_BUILD=true
4738

39+
COPY install /opt/install
4840
COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
4941
RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
5042
RUN apt install -y npm && npm install -g [email protected]
5143

5244
USER devuser
5345

5446
WORKDIR /workspaces/opentelemetry-cpp
47+
RUN cd /opt && bash ci/install_thirdparty.sh --install-dir /home/devuser/third-party/install-stable --tags-file install/cmake/third_party_stable
48+
ENV CMAKE_PREFIX_PATH=/home/devuser/third-party/install-stable
5549

5650
ENTRYPOINT []
5751

58-
CMD ["/bin/bash"]
52+
CMD ["/bin/bash"]

.devcontainer/README.md

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +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-
136
* **CXX standard:**
147
This is the C++ standard to build from (eg: 17, 20, ...). (Default: 17)
158
* Docker ARG:
169
`CXX_STANDARD`
1710
* Host Environment Variable:
1811
`OTEL_CPP_DEVCONTAINER_CXX_STANDARD`
1912

20-
* **abseil-cpp version:**
21-
This is the version of abseil-cpp that will be used to build protobuf, gRPC,
22-
and opentelemetry-cpp.
23-
* Docker ARG:
24-
`ABSEIL_CPP_VERSION`
25-
* Host Environment Variable:
26-
`OTEL_CPP_DEVCONTAINER_ABSEIL_CPP_VERSION`
27-
28-
* **Protobuf version:**
29-
* Docker ARG:
30-
`PROTOBUF_VERSION`
31-
* Host Environment Variable:
32-
`OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION`
33-
34-
* **gRPC version:**
35-
* Docker ARG:
36-
`GRPC_VERSION`
37-
* Host Environment Variable:
38-
`OTEL_CPP_DEVCONTAINER_GRPC_VERSION`
39-
4013
* **User ID (UID):**
4114
User ID (Default: `1000`)
4215
* Docker ARG:

.devcontainer/devcontainer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +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}",
15-
"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}",
16-
"GRPC_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_GRPC_VERSION:v1.55.0}",
17-
"PROTOBUF_VERSION": "${localEnv:OTEL_CPP_DEVCONTAINER_PROTOBUF_VERSION:23.3}",
18-
"ABSEIL_CPP_VERSION":"${localEnv:OTEL_CPP_DEVCONTAINER_ABSEIL_CPP_VERSION:20230125.3}"
14+
"CXX_STANDARD": "${localEnv:OTEL_CPP_DEVCONTAINER_CXX_STANDARD:17}"
1915
}
2016
},
2117
"customizations": {

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ What did you see instead?
1717

1818
**Additional context**
1919
Add any other context about the problem here.
20+
21+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ Which alternative solutions or features have you considered?
1717

1818
**Additional context**
1919
Add any other context about the feature request here.
20+
21+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

0 commit comments

Comments
 (0)