Skip to content

Commit

Permalink
chore(deps): update opentelemetry to v1.14.0 (#13627)
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate-bot authored Feb 23, 2024
1 parent 43fc48e commit c057b96
Show file tree
Hide file tree
Showing 22 changed files with 39 additions and 33 deletions.
8 changes: 4 additions & 4 deletions bazel/workspace0.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,11 @@ def gl_cpp_workspace0(name = None):
http_archive,
name = "io_opentelemetry_cpp",
urls = [
"https://storage.googleapis.com/cloud-cpp-community-archive/io_opentelemetry_cpp/v1.13.0.tar.gz",
"https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz",
"https://storage.googleapis.com/cloud-cpp-community-archive/io_opentelemetry_cpp/v1.14.0.tar.gz",
"https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz",
],
sha256 = "7735cc56507149686e6019e06f588317099d4522480be5f38a2a09ec69af1706",
strip_prefix = "opentelemetry-cpp-1.13.0",
sha256 = "9a67561b8f4dba8cf8bb323b404069cbcc2f59974e1330b1ba192c5c8d68c28e",
strip_prefix = "opentelemetry-cpp-1.14.0",
repo_mapping = {
"@curl": "@com_github_curl_curl",
"@com_github_google_benchmark": "@com_github_benchmark",
Expand Down
Binary file modified ci/abi-dumps/google_cloud_cpp_opentelemetry.expected.abi.dump.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/centos-7.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ RUN curl -fsSL https://github.com/google/benchmark/archive/v1.8.3.tar.gz | \
# GCC 7.x. See https://github.com/open-telemetry/opentelemetry-cpp/issues/1014
# for more details.
WORKDIR /var/tmp/build/
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
sed -i 's/Stack &GetStack()/Stack \&GetStack() __attribute__((noinline, noclone))/' "api/include/opentelemetry/context/runtime_context.h" && \
cmake \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-alpine-stable.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ RUN curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-centos-7.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-debian-bookworm.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ RUN curl -fsSL https://github.com/google/crc32c/archive/1.1.2.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-debian-bullseye.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.62.0.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-debian-buster.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.62.0.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-fedora.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-opensuse-leap.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-rockylinux-8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-rockylinux-9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-ubuntu-focal.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/demo-ubuntu-jammy.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \

# ```bash
WORKDIR /var/tmp/build/opentelemetry-cpp
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.62.0.tar.gz | \
ldconfig && cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=14 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-latest-cxx14.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.62.0.tar.gz | \
cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=14 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-latest-cxx20.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.62.0.tar.gz | \
cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=20 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \
ldconfig

WORKDIR /var/tmp/build/
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=14 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/fedora-m32.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ RUN curl -fsSL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz | \
# compiled with. And we use the compiler flags from ci/etc/m32-toolchain.cmake
# to force a 32-bit install.
WORKDIR /var/tmp/build/opentelemetry
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=17 \
Expand Down
2 changes: 1 addition & 1 deletion ci/cloudbuild/dockerfiles/ubuntu-20.04-install.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ RUN curl -fsSL https://github.com/grpc/grpc/archive/v1.62.0.tar.gz | \
cd /var/tmp && rm -fr build

WORKDIR /var/tmp/build/
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_CXX_STANDARD=14 \
Expand Down
22 changes: 11 additions & 11 deletions doc/packaging.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -334,7 +334,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -528,7 +528,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -700,7 +700,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -885,7 +885,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -994,7 +994,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -1167,7 +1167,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -1350,7 +1350,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -1564,7 +1564,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -1784,7 +1784,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down Expand Up @@ -2005,7 +2005,7 @@ recommend installing this library because:

```bash
mkdir -p $HOME/Downloads/opentelemetry-cpp && cd $HOME/Downloads/opentelemetry-cpp
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.13.0.tar.gz | \
curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.14.0.tar.gz | \
tar -xzf - --strip-components=1 && \
cmake \
-DCMAKE_BUILD_TYPE=Release \
Expand Down
6 changes: 6 additions & 0 deletions google/cloud/opentelemetry/internal/recordable.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <google/devtools/cloudtrace/v2/tracing.pb.h>
#include <opentelemetry/common/attribute_value.h>
#include <opentelemetry/sdk/trace/recordable.h>
#include <opentelemetry/version.h>

namespace google {
namespace cloud {
Expand Down Expand Up @@ -126,6 +127,11 @@ class Recordable final : public opentelemetry::sdk::trace::Recordable {

void SetName(opentelemetry::nostd::string_view name) noexcept override;

#if OPENTELEMETRY_VERSION_MAJOR > 1 || \
(OPENTELEMETRY_VERSION_MAJOR == 1 && OPENTELEMETRY_VERSION_MINOR >= 14)
void SetTraceFlags(opentelemetry::trace::TraceFlags) noexcept override {}
#endif

void SetSpanKind(opentelemetry::trace::SpanKind span_kind) noexcept override;

void SetResource(
Expand Down

0 comments on commit c057b96

Please sign in to comment.