Skip to content

Commit 1219b5d

Browse files
authored
Revert "Remove gRPC dependency for Docker - temporary (#168)" (#169)
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.
1 parent b1bad4e commit 1219b5d

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

.github/workflows/main_build.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ on:
55
branches:
66
- main
77
- "release/v*"
8-
pull_request:
9-
branches:
10-
- main
11-
128
env:
139
AWS_DEFAULT_REGION: us-east-1
1410
STAGING_ECR_REGISTRY: 637423224110.dkr.ecr.us-east-1.amazonaws.com

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ WORKDIR /operator-build
1616
ADD aws-opentelemetry-distro/ ./aws-opentelemetry-distro/
1717

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

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

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
)
1818
from amazon.opentelemetry.distro.aws_span_metrics_processor_builder import AwsSpanMetricsProcessorBuilder
1919
from amazon.opentelemetry.distro.sampler.aws_xray_remote_sampler import AwsXRayRemoteSampler
20+
from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import OTLPMetricExporter as OTLPGrpcOTLPMetricExporter
2021
from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter as OTLPHttpOTLPMetricExporter
2122
from opentelemetry.sdk._configuration import (
2223
_get_exporter_names,
@@ -301,12 +302,6 @@ def create_exporter(self):
301302
endpoint=application_signals_endpoint, preferred_temporality=temporality_dict
302303
)
303304
if protocol == "grpc":
304-
# pylint: disable=import-outside-toplevel
305-
# Delay import to only occur if grpc required.
306-
from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
307-
OTLPMetricExporter as OTLPGrpcOTLPMetricExporter,
308-
)
309-
310305
return OTLPGrpcOTLPMetricExporter(
311306
endpoint=application_signals_endpoint, preferred_temporality=temporality_dict
312307
)

0 commit comments

Comments
 (0)