Skip to content

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

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
May 15, 2025
Merged

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

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
cacfe44
[BUILD] Upgrade nlohmann_json to 3.12.0 (#3406)
marcalff May 14, 2025
364b860
[BUILD] Upgrade opentelemetry-proto to 1.6.0 (#3407)
marcalff May 15, 2025
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: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@ Increment the:
[#3320](https://github.com/open-telemetry/opentelemetry-cpp/pull/3220)
[#3368](https://github.com/open-telemetry/opentelemetry-cpp/pull/3368)

* [BUILD] Upgrade opentelemetry-proto to 1.6.0
[#3407](https://github.com/open-telemetry/opentelemetry-cpp/pull/3407)

* [BUILD] Upgrade nlohmann_json to 3.12.0
[#3406](https://github.com/open-telemetry/opentelemetry-cpp/pull/3406)

## [1.20 2025-04-01]

* [BUILD] Update opentelemetry-proto version
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "com_google_a
bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "curl", version = "8.8.0")
bazel_dep(name = "grpc", version = "1.63.1.bcr.1", repo_name = "com_github_grpc_grpc")
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "github_nlohmann_json")
bazel_dep(name = "opentelemetry-proto", version = "1.5.0", repo_name = "com_github_opentelemetry_proto")
bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "github_nlohmann_json")
bazel_dep(name = "opentelemetry-proto", version = "1.6.0", repo_name = "com_github_opentelemetry_proto")
bazel_dep(name = "opentracing-cpp", version = "1.6.0", repo_name = "com_github_opentracing")
bazel_dep(name = "platforms", version = "0.0.8")
bazel_dep(name = "prometheus-cpp", version = "1.3.0", repo_name = "com_github_jupp0r_prometheus_cpp")
Expand Down
10 changes: 5 additions & 5 deletions bazel/repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ def opentelemetry_cpp_deps():
http_archive,
name = "com_github_opentelemetry_proto",
build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
sha256 = "08f40636adbc5f33d2084bd8e7b64e491dd0239d1a95021dbffbdf1ca8cea454",
strip_prefix = "opentelemetry-proto-1.5.0",
sha256 = "92682778affe8d00cd36f68308b49295db34fce379bef0a781c50837eccbc3c0",
strip_prefix = "opentelemetry-proto-1.6.0",
urls = [
"https://github.com/open-telemetry/opentelemetry-proto/archive/v1.5.0.tar.gz",
"https://github.com/open-telemetry/opentelemetry-proto/archive/v1.6.0.tar.gz",
],
)

Expand All @@ -100,9 +100,9 @@ def opentelemetry_cpp_deps():
http_archive,
name = "github_nlohmann_json",
build_file = "@io_opentelemetry_cpp//bazel:nlohmann_json.BUILD",
sha256 = "a22461d13119ac5c78f205d3df1db13403e58ce1bb1794edc9313677313f4a9d",
sha256 = "b8cb0ef2dd7f57f18933997c9934bb1fa962594f701cd5a8d3c2c80541559372",
urls = [
"https://github.com/nlohmann/json/releases/download/v3.11.3/include.zip",
"https://github.com/nlohmann/json/releases/download/v3.12.0/include.zip",
],
)

Expand Down
2 changes: 1 addition & 1 deletion cmake/opentelemetry-proto.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ else()
"opentelemetry-proto=[ \\t]*([A-Za-z0-9_\\.\\-]+)")
set(opentelemetry-proto "${CMAKE_MATCH_1}")
else()
set(opentelemetry-proto "v1.5.0")
set(opentelemetry-proto "v1.6.0")
endif()
unset(OTELCPP_THIRD_PARTY_RELEASE_CONTENT)
endif()
Expand Down
4 changes: 2 additions & 2 deletions install/conan/conanfile_latest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ libcurl/8.12.1
abseil/20240116.2
protobuf/5.27.0
grpc/1.67.1
nlohmann_json/3.11.3
nlohmann_json/3.12.0
prometheus-cpp/1.3.0
opentracing-cpp/1.6.0

Expand Down Expand Up @@ -37,4 +37,4 @@ CMakeToolchain
CMakeDeps

[layout]
cmake_layout
cmake_layout
2 changes: 1 addition & 1 deletion third_party/nlohmann-json
Open in desktop
Submodule nlohmann-json updated 837 files
2 changes: 1 addition & 1 deletion third_party/opentelemetry-proto
Open in desktop
Submodule opentelemetry-proto updated 19 files
+2 −1 .github/CODEOWNERS
+69 −46 .github/workflows/build-check.yaml
+20 −0 .github/workflows/fossa.yml
+47 −0 .github/workflows/ossf-scorecard.yml
+9 −0 .lychee.toml
+0 −22 .markdown_link_check_config.json
+7 −1 CHANGELOG.md
+16 −1 CONTRIBUTING.md
+7 −5 Makefile
+21 −3 docs/specification.md
+0 −2 opentelemetry/proto/collector/logs/v1/logs_service.proto
+0 −2 opentelemetry/proto/collector/metrics/v1/metrics_service.proto
+0 −2 opentelemetry/proto/collector/profiles/v1development/profiles_service.proto
+0 −2 opentelemetry/proto/collector/trace/v1/trace_service.proto
+34 −0 opentelemetry/proto/common/v1/common.proto
+0 −2 opentelemetry/proto/logs/v1/logs.proto
+11 −6 opentelemetry/proto/metrics/v1/metrics.proto
+64 −59 opentelemetry/proto/profiles/v1development/profiles.proto
+7 −0 opentelemetry/proto/resource/v1/resource.proto
4 changes: 2 additions & 2 deletions third_party_release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ abseil=20240116.1
benchmark=v1.8.3
googletest=1.14.0
ms-gsl=v3.1.0-67-g6f45293
nlohmann-json=v3.11.3
opentelemetry-proto=v1.5.0
nlohmann-json=v3.12.0
opentelemetry-proto=v1.6.0
opentracing-cpp=v1.6.0
prometheus-cpp=v1.3.0
vcpkg=2024.02.14
Loading