Skip to content

Commit

Permalink
Upgrade nlohmann_json to 3.10.5 (#1438) (#1441)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff committed Jun 10, 2022
1 parent 423a1a2 commit 33567b9
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 4 deletions.
17 changes: 15 additions & 2 deletions bazel/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@ filegroup(
)
"""

#
# MAINTAINER
#
# This file is used for the Bazel build.
#
# When changing (add, upgrade, remove) dependencies
# please update:
# - the CMake build, see file
# <root>/third_party_release
# - git submodule, see command
# git submodule status
#

def opentelemetry_cpp_deps():
"""Loads dependencies need to compile the opentelemetry-cpp library."""

Expand Down Expand Up @@ -86,9 +99,9 @@ def opentelemetry_cpp_deps():
http_archive,
name = "github_nlohmann_json",
build_file = "@io_opentelemetry_cpp//bazel:nlohmann_json.BUILD",
sha256 = "69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf",
sha256 = "b94997df68856753b72f0d7a3703b7d484d4745c567f3584ef97c96c25a5798e",
urls = [
"https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip",
"https://github.com/nlohmann/json/releases/download/v3.10.5/include.zip",
],
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/nlohmann-json
Submodule nlohmann-json updated 627 files
15 changes: 14 additions & 1 deletion third_party_release
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
#
# MAINTAINER
#
# This file is used for the CMake build.
#
# When changing (add, upgrade, remove) dependencies
# please update:
# - the Bazel build, see file
# <root>/bazel/repository.bzl
# - git submodule, see command
# git submodule status
#

gRPC=v1.43.2
thrift=0.14.1
abseil=20210324.0
benchmark=v1.5.3
googletest=release-1.10.0-459-ga6dfd3ac
ms-gsl=v3.1.0-67-g6f45293
nlohmann-json=v3.9.1
nlohmann-json=v3.10.5
opentelemetry-proto=v0.17.0
prometheus-cpp=v1.0.0
vcpkg=2022.04.12

1 comment on commit 33567b9

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'OpenTelemetry-cpp sdk Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 33567b9 Previous: 423a1a2 Ratio
BM_BaselineBuffer/2 11354043.48373413 ns/iter 2125384.80758667 ns/iter 5.34
BM_LockFreeBuffer/2 2374247.35429222 ns/iter 941833.9729309082 ns/iter 2.52

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.