Skip to content

Commit

Permalink
Revert adservice local batch processor (open-telemetry#6)
Browse files Browse the repository at this point in the history
* Revert "Merge pull request open-telemetry#1 from jack-berg/adservice-local-trace-batching-processor"

This reverts commit cd3efeb, reversing
changes made to 7d8ab92.

* Revert "revert changes to .env"

This reverts commit 05e85fb.

* Revert "Adservice uses local trace batching processor"

This reverts commit bee2d31.
  • Loading branch information
alanwest authored Dec 5, 2023
1 parent 74af215 commit fd7cb4f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://localhost:8080/otlp-http/v1/tra
OTEL_RESOURCE_ATTRIBUTES="service.namespace=opentelemetry-demo"

# Metrics Temporality
OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=delta
OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE=cumulative

# ******************
# Core Demo Services
Expand Down
13 changes: 1 addition & 12 deletions src/adservice/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,6 @@

FROM eclipse-temurin:21-jdk as builder

WORKDIR /usr/src/

RUN apt-get update && apt-get install unzip

RUN curl -L https://github.com/jack-berg/opentelemetry-java-contrib/archive/refs/heads/local-trace-batch-processor.zip --output contrib.zip \
&& unzip contrib.zip \
&& mv opentelemetry-java-contrib-local-trace-batch-processor ./contrib \
&& cd contrib \
&& ./gradlew :processors:assemble

WORKDIR /usr/src/app/

COPY ./src/adservice/gradlew* ./src/adservice/settings.gradle* ./src/adservice/build.gradle .
Expand All @@ -34,9 +24,8 @@ ARG version=1.31.0
WORKDIR /usr/src/app/

COPY --from=builder /usr/src/app/ ./
COPY --from=builder /usr/src/contrib/processors/build/libs/local-trace-batch-processor.jar ./local-trace-batch-processor.jar
ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
ENV JAVA_TOOL_OPTIONS="-javaagent:/usr/src/app/opentelemetry-javaagent.jar -Dotel.javaagent.extensions=/usr/src/app/local-trace-batch-processor.jar"
ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar

EXPOSE ${AD_SERVICE_PORT}
ENTRYPOINT [ "./build/install/opentelemetry-demo-ad-service/bin/AdService" ]

0 comments on commit fd7cb4f

Please sign in to comment.