Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add capability to build docker all-in-one #3812

Closed

Conversation

albertteoh
Copy link
Contributor

@albertteoh albertteoh commented Jul 13, 2022

Which problem is this PR solving?

  • As a developer, I want to quickly test changes to SPM locally, which depends on the jaegertracing/all-in-one:latest image.
  • Building this image is currently not supported in the current Makefile.

Short description of the changes

  • Add all-in-one component to the list of components to build docker images for.
  • Achieved by modifying the Internal Field Separator to be a comma in order to support both jaeger components as well as all-in-one.
  • Note: I don't believe this impacts existing CI builds, which utilise the scripts/build-all-in-one-image.sh for all-in-one, and scripts/build-upload-docker-images.sh for other components. These scripts, in turn, execute their own docker commands (not sure why, instead of using Makefile targets).

Testing

@albertteoh albertteoh requested a review from a team as a code owner July 13, 2022 13:22
@albertteoh albertteoh requested a review from vprithvi July 13, 2022 13:22
albertteoh and others added 28 commits July 13, 2022 23:26
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Johannes Würbach <johannes.wuerbach@googlemail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…ing#3545)

Bumps [github.com/go-openapi/validate](https://github.com/go-openapi/validate) from 0.20.3 to 0.21.0.
- [Release notes](https://github.com/go-openapi/validate/releases)
- [Commits](go-openapi/validate@v0.20.3...v0.21.0)

---
updated-dependencies:
- dependency-name: github.com/go-openapi/validate
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.5.1 to 3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v2.5.1...v3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…ng#3544)

Bumps [github.com/go-openapi/runtime](https://github.com/go-openapi/runtime) from 0.23.0 to 0.23.1.
- [Release notes](https://github.com/go-openapi/runtime/releases)
- [Commits](go-openapi/runtime@v0.23.0...v0.23.1)

---
updated-dependencies:
- dependency-name: github.com/go-openapi/runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
)

Bumps [github.com/Shopify/sarama](https://github.com/Shopify/sarama) from 1.31.1 to 1.32.0.
- [Release notes](https://github.com/Shopify/sarama/releases)
- [Changelog](https://github.com/Shopify/sarama/blob/main/CHANGELOG.md)
- [Commits](IBM/sarama@v1.31.1...v1.32.0)

---
updated-dependencies:
- dependency-name: github.com/Shopify/sarama
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>

Co-authored-by: Albert <26584478+albertteoh@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…rtracing#3560)

Bumps [go.opentelemetry.io/collector/model](https://github.com/open-telemetry/opentelemetry-collector) from 0.45.0 to 0.46.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-collector@v0.45.0...v0.46.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/collector/model
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
* Add release in changelog and pin UI

Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>

* Fix date

Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
* Add support for ciphersuites in tls config

Signed-off-by: Ashmita <ashmita.bohara@logz.io>

* Feedbacks

Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>

* Feedbacks

Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>

* Feedbacks

Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
* Add minimum tls version support in tls config

Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>

* Feedbacks

Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>

* Add maximum tls version support in tls config

Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>

* Feedbacks

Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…gration tests (jaegertracing#3416)

* Wait for elasticsearch/opensearch to be ready before running the integration tests

Signed-off-by: Ashmita Bohara <ashmita.bohara@logz.io>

* Feedbacks

Signed-off-by: Ashmita152 <ashmita.bohara@logz.io>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…#3570)

Bumps [github.com/hashicorp/go-hclog](https://github.com/hashicorp/go-hclog) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/hashicorp/go-hclog/releases)
- [Commits](hashicorp/go-hclog@v1.1.0...v1.2.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/go-hclog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…ng#3568)

Bumps [github.com/go-openapi/runtime](https://github.com/go-openapi/runtime) from 0.23.1 to 0.23.2.
- [Release notes](https://github.com/go-openapi/runtime/releases)
- [Commits](go-openapi/runtime@v0.23.1...v0.23.2)

---
updated-dependencies:
- dependency-name: github.com/go-openapi/runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
* Added SAMPLING_STORAGE_TYPE support in factory config

Signed-off-by: Joe Elliott <number101010@gmail.com>

* Added factory support and tests

Signed-off-by: Joe Elliott <number101010@gmail.com>

* review

Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Changelog](https://github.com/spf13/cobra/blob/master/CHANGELOG.md)
- [Commits](spf13/cobra@v1.3.0...v1.4.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.7.0...v1.7.1)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…ng#3594)

Bumps [github.com/go-openapi/runtime](https://github.com/go-openapi/runtime) from 0.23.2 to 0.23.3.
- [Release notes](https://github.com/go-openapi/runtime/releases)
- [Commits](go-openapi/runtime@v0.23.2...v0.23.3)

---
updated-dependencies:
- dependency-name: github.com/go-openapi/runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…rtracing#3592)

Bumps [go.opentelemetry.io/collector/model](https://github.com/open-telemetry/opentelemetry-collector) from 0.46.0 to 0.47.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-collector@v0.46.0...v0.47.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/collector/model
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
yurishkuro and others added 23 commits July 13, 2022 23:26
* Copy metrics API from jaeger-lib

Signed-off-by: Yuri Shkuro <github@ysh.us>

* fix builder

Signed-off-by: Yuri Shkuro <github@ysh.us>

* move

Signed-off-by: Yuri Shkuro <github@ysh.us>

* copy-fork

Signed-off-by: Yuri Shkuro <github@ysh.us>

* upgrade-agent

Signed-off-by: Yuri Shkuro <github@ysh.us>

* refactor-all

Signed-off-by: Yuri Shkuro <github@ysh.us>

* fmt

Signed-off-by: Yuri Shkuro <github@ysh.us>

* undo

Signed-off-by: Yuri Shkuro <github@ysh.us>

* fix

Signed-off-by: Yuri Shkuro <github@ysh.us>

* tests

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…#3771)

Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.4.0...v1.5.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
* Upgrade dependencies

Signed-off-by: Yuri Shkuro <github@ysh.us>

* fix-test

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…g#3770)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.34.0 to 0.35.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.34.0...v0.35.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/common
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.7.4...v1.7.5)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
* Add parameter to enable processed span metrics

Signed-off-by: Yosuke Matsuda <ymatsuda.zck@gmail.com>

* Rename some fields `processedSpanMetrics` to `spanSizeMetrics`

Signed-off-by: Yosuke Matsuda <ymatsuda.zck@gmail.com>

* Improve test reliability and readability

Signed-off-by: Yosuke Matsuda <ymatsuda.zck@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.5 to 1.8.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.7.5...v1.8.0)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…anslator/jaeger (jaegertracing#3776)

Bumps [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib) from 0.53.0 to 0.54.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-collector-contrib@v0.53.0...v0.54.0)

---
updated-dependencies:
- dependency-name: github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…aegertracing#3787)

* Log missing tenancy at debug level

Signed-off-by: Ed Snible <snible@us.ibm.com>

* Debug message and code coverage

Signed-off-by: Ed Snible <snible@us.ibm.com>

* Simplify test

Signed-off-by: Ed Snible <snible@us.ibm.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
* Introduce ParentReference adjuster

As demonstrated in https://github.com/jaegertracing/jaeger-ui/issues/966,
jaeger-ui expects the first reference to be of `CHILD_OF` type to properly
render the tree. This new adjuster achieves exactly that.

Signed-off-by: Ivan Babrou <github@ivan.computer>

* Simplify algorithm, clean-up tests

Signed-off-by: Yuri Shkuro <github@ysh.us>

Co-authored-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Resolves jaegertracing#3792

Signed-off-by: Yuri Shkuro <github@ysh.us>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
* Update CHANGELOG and rotate releaser managers

Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>

* Update changelog and jaeger-ui tag

Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: albertteoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
…3801)

Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.47.0 to 1.48.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.47.0...v1.48.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
Signed-off-by: Albert Teoh <see.kwang.teoh@gmail.com>
@albertteoh albertteoh force-pushed the build-docker-all-in-one branch from 4a90fe7 to 685554f Compare July 13, 2022 13:27
@codecov
Copy link

codecov bot commented Jul 13, 2022

Codecov Report

Merging #3812 (4a90fe7) into main (2781f27) will not change coverage.
The diff coverage is n/a.

❗ Current head 4a90fe7 differs from pull request most recent head 685554f. Consider uploading reports for the commit 685554f to get more accurate results

@@           Coverage Diff           @@
##             main    #3812   +/-   ##
=======================================
  Coverage   97.58%   97.58%           
=======================================
  Files         289      289           
  Lines       16800    16800           
=======================================
  Hits        16394    16394           
  Misses        321      321           
  Partials       85       85           

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 2781f27...685554f. Read the comment docs.

@albertteoh albertteoh closed this Jul 13, 2022
@albertteoh albertteoh deleted the build-docker-all-in-one branch July 13, 2022 13:34
@albertteoh albertteoh restored the build-docker-all-in-one branch July 13, 2022 13:35
@albertteoh albertteoh deleted the build-docker-all-in-one branch July 13, 2022 13:39
@albertteoh
Copy link
Contributor Author

Closed in preference of #3813, due to messing up sign-off.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.