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.

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

Fix and minor improvements to all-in-one github action #2667

Merged
merged 1 commit into from
Nov 30, 2020
Merged

Fix and minor improvements to all-in-one github action #2667

merged 1 commit into from
Nov 30, 2020

Conversation

Ashmita152
Copy link
Contributor

Signed-off-by: Ashmita Bohara ashmita.bohara152@gmail.com

Which problem is this PR solving?

This add fix and improvements suggested in #2663

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
@Ashmita152 Ashmita152 requested a review from a team as a code owner November 30, 2020 01:27
@mergify mergify bot requested a review from jpkrohling November 30, 2020 01:27
@codecov
Copy link

codecov bot commented Nov 30, 2020

Codecov Report

Merging #2667 (582f3ae) into master (ae162b8) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2667   +/-   ##
=======================================
  Coverage   95.10%   95.10%           
=======================================
  Files         213      213           
  Lines        9491     9491           
=======================================
  Hits         9026     9026           
  Misses        388      388           
  Partials       77       77           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ae162b8...582f3ae. Read the comment docs.

@yurishkuro yurishkuro merged commit da430fa into jaegertracing:master Nov 30, 2020
echo "BRANCH=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
export BRANCH=${GITHUB_HEAD_REF}
echo "we are on branch=$BRANCH"
echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
Copy link
Member

Choose a reason for hiding this comment

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

The next step could also echo the value

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sure, I will do that while moving this to its own action as you suggested. Since it can be shared with other docker build and push jobs for all jaeger components.

@yurishkuro
Copy link
Member

the build failed on master https://github.com/jaegertracing/jaeger/runs/1471508769?check_suite_focus=true

+ docker login docker.io -u -p
/home/runner/.docker/config.json doesn't exist
Error: Cannot perform an interactive login from a non TTY device
Error: Process completed with exit code 1.

@Ashmita152
Copy link
Contributor Author

Ashmita152 commented Nov 30, 2020

Hi @yurishkuro

Do you recommend to remove the docker login command from the upload-to-docker.sh script completely. Now that we are going to move all the GitHub Actions probably we can do that.

@yurishkuro
Copy link
Member

I doubt that we can remove it completely, without credentials we cannot upload the images.

@Ashmita152
Copy link
Contributor Author

I doubt that we can remove it completely, without credentials we cannot upload the images.

Sorry for my limited knowledge. By unable to upload the images, do you mean other jaeger components images ?

@yurishkuro
Copy link
Member

nvm, once I saw the PR I see what you meant by removing login - the explicit login in the script should be removed.

yurishkuro added a commit that referenced this pull request Jan 13, 2021
…ectors (#2657)

* add metrics that show agent connection collector status

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* update comment

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* exec make fmt

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify function and add testing relevant code in the builder_test.go

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* add comment in connect_metrics.go

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify code and changed use expvar to show target

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify code and changed use expvar to show target

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* exec make fmt

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix collector panic due to sarama sdk returning nil error (#2654)

Signed-off-by: luhualin <luhualin@bilibili.com>

Co-authored-by: luhualin <luhualin@bilibili.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix flaky tbuffered server test (#2635)

* Fix flaky tbuffered server test

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* Apply suggestions from code review - more readable comments

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Add github actions for integration tests (#2649)

* Add github action for jaeger integration tests

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Create separate workflow for each integration test

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Clean-up GH action names (#2661)

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix for failures in badger integration tests (#2660)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Add protogen validation test (#2662)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Add github action for jaeger all-in-one image (#2663)

* Add github action for jaeger all-in-one image

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Make steps self-explantory

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Fix git tags issue

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Fix ES integration test

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Update comment that looks confusing during builds

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Use GitHub actions based build badges

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix and minor improvements to all-in-one github action (#2667)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix docker login issue with all-in-one build (#2668)

* Fix docker login issue with all-in-one build

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Fix docker login issue with all-in-one build

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix issue with all-in-one build (#2669)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Update cmd/agent/app/reporter/connect_metrics.go

accept suggestions

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Update cmd/agent/app/reporter/connect_metrics.go

accept suggestions

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{}

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{}

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* merage from the lastest master branch and exec make fmt

Signed-off-by: walker.wangxy <walker.wangxy@walkerwangxydeMacBook-Pro.local>

* add comment on ConnectMetrics

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* clear up redundant codes

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

Co-authored-by: WalkerWang731 <walkerwang731@gmail.com>
Co-authored-by: Betula-L <N.Betula.Lu@gmail.com>
Co-authored-by: luhualin <luhualin@bilibili.com>
Co-authored-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Ashmita <ashmita.bohara152@gmail.com>
Co-authored-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: walker.wangxy <walker.wangxy@walkerwangxydeMacBook-Pro.local>
bhiravabhatla pushed a commit to bhiravabhatla/jaeger that referenced this pull request Jan 25, 2021
…ectors (jaegertracing#2657)

* add metrics that show agent connection collector status

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* update comment

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* exec make fmt

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify function and add testing relevant code in the builder_test.go

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* add comment in connect_metrics.go

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify code and changed use expvar to show target

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify code and changed use expvar to show target

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* exec make fmt

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix collector panic due to sarama sdk returning nil error (jaegertracing#2654)

Signed-off-by: luhualin <luhualin@bilibili.com>

Co-authored-by: luhualin <luhualin@bilibili.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix flaky tbuffered server test (jaegertracing#2635)

* Fix flaky tbuffered server test

Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

* Apply suggestions from code review - more readable comments

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Add github actions for integration tests (jaegertracing#2649)

* Add github action for jaeger integration tests

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Create separate workflow for each integration test

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Clean-up GH action names (jaegertracing#2661)

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix for failures in badger integration tests (jaegertracing#2660)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Add protogen validation test (jaegertracing#2662)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Add github action for jaeger all-in-one image (jaegertracing#2663)

* Add github action for jaeger all-in-one image

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Feedbacks changes

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Make steps self-explantory

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Fix git tags issue

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Fix ES integration test

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Update comment that looks confusing during builds

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Use GitHub actions based build badges

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix and minor improvements to all-in-one github action (jaegertracing#2667)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix docker login issue with all-in-one build (jaegertracing#2668)

* Fix docker login issue with all-in-one build

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>

* Fix docker login issue with all-in-one build

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Fix issue with all-in-one build (jaegertracing#2669)

Signed-off-by: Ashmita Bohara <ashmita.bohara152@gmail.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Update cmd/agent/app/reporter/connect_metrics.go

accept suggestions

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* Update cmd/agent/app/reporter/connect_metrics.go

accept suggestions

Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{}

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* simplify the code that remove ConnectMetricsParams{} and integrate ConnectMetrics{}

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* merage from the lastest master branch and exec make fmt

Signed-off-by: walker.wangxy <walker.wangxy@walkerwangxydeMacBook-Pro.local>

* add comment on ConnectMetrics

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

* clear up redundant codes

Signed-off-by: WalkerWang731 <wxy1990731@hotmail.com>

Co-authored-by: WalkerWang731 <walkerwang731@gmail.com>
Co-authored-by: Betula-L <N.Betula.Lu@gmail.com>
Co-authored-by: luhualin <luhualin@bilibili.com>
Co-authored-by: Pavel Kositsyn <kositsyn.pa@phystech.edu>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Co-authored-by: Ashmita <ashmita.bohara152@gmail.com>
Co-authored-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: walker.wangxy <walker.wangxy@walkerwangxydeMacBook-Pro.local>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants