Skip to content

Commit

Permalink
Revert "Remove gRPC dependency for Docker - temporary (#168)" (#169)
Browse files Browse the repository at this point in the history
This reverts commit b1bad4e.

*Issue #, if available:*

*Description of changes:*


By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice.
  • Loading branch information
thpierce authored Apr 20, 2024
1 parent b1bad4e commit 1219b5d
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/main_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ on:
branches:
- main
- "release/v*"
pull_request:
branches:
- main

env:
AWS_DEFAULT_REGION: us-east-1
STAGING_ECR_REGISTRY: 637423224110.dkr.ecr.us-east-1.amazonaws.com
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ WORKDIR /operator-build
ADD aws-opentelemetry-distro/ ./aws-opentelemetry-distro/

RUN mkdir workspace && pip install --target workspace ./aws-opentelemetry-distro
RUN pip uninstall opentelemetry-exporter-otlp-proto-grpc -y
RUN pip uninstall grpcio -y

FROM public.ecr.aws/amazonlinux/amazonlinux:minimal

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
)
from amazon.opentelemetry.distro.aws_span_metrics_processor_builder import AwsSpanMetricsProcessorBuilder
from amazon.opentelemetry.distro.sampler.aws_xray_remote_sampler import AwsXRayRemoteSampler
from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import OTLPMetricExporter as OTLPGrpcOTLPMetricExporter
from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter as OTLPHttpOTLPMetricExporter
from opentelemetry.sdk._configuration import (
_get_exporter_names,
Expand Down Expand Up @@ -301,12 +302,6 @@ def create_exporter(self):
endpoint=application_signals_endpoint, preferred_temporality=temporality_dict
)
if protocol == "grpc":
# pylint: disable=import-outside-toplevel
# Delay import to only occur if grpc required.
from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
OTLPMetricExporter as OTLPGrpcOTLPMetricExporter,
)

return OTLPGrpcOTLPMetricExporter(
endpoint=application_signals_endpoint, preferred_temporality=temporality_dict
)
Expand Down

0 comments on commit 1219b5d

Please sign in to comment.