Skip to content
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

Jump to bottom

checkout opentelemetry-proto v0.11.0 #1055

Merged
merged 5 commits into from
Nov 10, 2021
Merged

checkout opentelemetry-proto v0.11.0 #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a48c3f0
checkout opentelemetry-proto v0.11.0
esigo Nov 6, 2021
9a91332
checkout opentelemetry-proto v 0.11.0
esigo Nov 6, 2021
3810566
dependencies not coming as submodules
esigo Nov 8, 2021
b7eb32a
Merge branch 'main' into update-opentelemetry-proto
esigo Nov 9, 2021
4ab2b13
Merge branch 'main' into update-opentelemetry-proto
lalitb Nov 9, 2021
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
1 change: 1 addition & 0 deletions ci/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CI tests can be run on docker by invoking the script `./ci/run_docker.sh
checker.
* `benchmark`: run all benchmarks.
* `format`: use `tools/format.sh` to enforce text formatting.
* `third_party.tags`: store third_party release tags.
* `code.coverage`: build cmake targets with CXX option `--coverage` and run
tests.

Expand Down
6 changes: 6 additions & 0 deletions ci/do_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,12 @@ elif [[ "$1" == "code.coverage" ]]; then
lcov --remove coverage.info '*/ext/http/server/*'> tmp_coverage.info 2>/dev/null
cp tmp_coverage.info coverage.info
exit 0
elif [[ "$1" == "third_party.tags" ]]; then
echo "gRPC=v1.39.1" > third_party_release
echo "thrift=0.14.1" >> third_party_release
echo "abseil=20210324.0" >> third_party_release
git submodule status | sed 's:.*/::' | sed 's/ (/=/g' | sed 's/)//g' >> third_party_release
exit 0
fi

echo "Invalid do_ci.sh target, see ci/README.md for valid targets."
Expand Down
2 changes: 1 addition & 1 deletion third_party/opentelemetry-proto
Open in desktop
Submodule opentelemetry-proto updated 7 files
+1 −0 .github/auto_assign.yml
+43 −3 CHANGELOG.md
+6 −6 README.md
+1 −1 opentelemetry/proto/common/v1/common.proto
+19 −0 opentelemetry/proto/logs/v1/logs.proto
+309 −179 opentelemetry/proto/metrics/v1/metrics.proto
+24 −5 opentelemetry/proto/trace/v1/trace.proto
10 changes: 10 additions & 0 deletions third_party_release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
gRPC=v1.39.1
thrift=0.14.1
abseil=20210324.0
benchmark=v1.5.3
googletest=release-1.8.0-2523-ga6dfd3ac
ms-gsl=v1.0.0-393-g6f45293
nlohmann-json=v3.9.1
opentelemetry-proto=v0.11.0
prometheus-cpp=v0.11.0
vcpkg=2020.04-2702-g5568f110b
Copy link
Member

Choose a reason for hiding this comment

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

Sorry if I am missing something. What is the purpose of adding this file, and also adding an option in do_ci.sh to create this file? Is it meant to be a central place to list versions of all the otel-cpp dependencies?

Copy link
Member Author

@esigo esigo Nov 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I believe it's a good idea to have the versions documented somewhere so the users can download the versions of the dependencies that a release has been published with. This would be obsolete if the plan is to not support older opentelemetry versions though.

Copy link
Member

@lalitb lalitb Nov 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Ok, that makes sense. Just wondering if this should also contain the dependencies not coming as submodules, eg gRPC(v1.39.1), thrift (0.14.1), abseil(20210324.0)?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes absolutely. Just added them to the script.