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

Revert collector back to contrib distribution #1048

Merged
merged 3 commits into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ jobs:
- file: ./src/loadgenerator/Dockerfile
tag_suffix: loadgenerator
context: ./
- file: ./src/otelcollector/Dockerfile
tag_suffix: otelcollector
context: ./
- file: ./src/paymentservice/Dockerfile
tag_suffix: paymentservice
context: ./
Expand Down
6 changes: 2 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ release.

## Unreleased

* [tests] Update trace-based tests run script
([#1018](https://github.com/open-telemetry/opentelemetry-demo/pull/1018))
* Add cartServiceFailure feature flag triggering Cart Service errors
([#824](https://github.com/open-telemetry/opentelemetry-demo/pull/824))
* [paymentservice] update JS SDKs to 1.12.0/0.38.0
Expand Down Expand Up @@ -67,10 +65,10 @@ release.
([#988](https://github.com/open-telemetry/opentelemetry-demo/pull/988))
* [FraudDetectionService] Updated Kotlin version and OTel dependencies
([#987](https://github.com/open-telemetry/opentelemetry-demo/pull/987))
* [otelcol] Use the collector builder to produce otelcol docker image
([#944](https://github.com/open-telemetry/opentelemetry-demo/pull/944))
* [quoteservice] update php dependencies
([#994](https://github.com/open-telemetry/opentelemetry-demo/issues/994))
* [tests] Update trace-based tests run script
([#1018](https://github.com/open-telemetry/opentelemetry-demo/pull/1018))
* [PaymentService] Update node to LTS version and bump deps
([#1029](https://github.com/open-telemetry/opentelemetry-demo/issues/1029))

Expand Down
7 changes: 1 addition & 6 deletions docker-compose.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -501,13 +501,8 @@ services:

# OpenTelemetry Collector
otelcol:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol
image: otel/opentelemetry-collector-contrib:0.82.0
container_name: otel-col
build:
context: ./
dockerfile: ./src/otelcollector/Dockerfile
cache_from:
- ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol
deploy:
resources:
limits:
Expand Down
7 changes: 1 addition & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -645,13 +645,8 @@ services:

# OpenTelemetry Collector
otelcol:
image: ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol
image: otel/opentelemetry-collector-contrib:0.82.0
container_name: otel-col
build:
context: ./
dockerfile: ./src/otelcollector/Dockerfile
cache_from:
- ${IMAGE_NAME}:${IMAGE_VERSION}-otelcol
deploy:
resources:
limits:
Expand Down
31 changes: 0 additions & 31 deletions src/otelcollector/Dockerfile

This file was deleted.

24 changes: 0 additions & 24 deletions src/otelcollector/manifest.yml

This file was deleted.