Skip to content

Commit 76a321a

Browse files
committed
Remove gRPC dependency for Docker
1 parent 6bab9db commit 76a321a

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

.github/workflows/main_build.yml

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
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
2120
from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter as OTLPHttpOTLPMetricExporter
2221
from opentelemetry.sdk._configuration import (
2322
_get_exporter_names,
@@ -302,6 +301,7 @@ def create_exporter(self):
302301
endpoint=application_signals_endpoint, preferred_temporality=temporality_dict
303302
)
304303
if protocol == "grpc":
304+
from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import OTLPMetricExporter as OTLPGrpcOTLPMetricExporter
305305
return OTLPGrpcOTLPMetricExporter(
306306
endpoint=application_signals_endpoint, preferred_temporality=temporality_dict
307307
)

contract-tests/images/applications/botocore/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ COPY ./contract-tests/images/applications/botocore /botocore
99
ENV PIP_ROOT_USER_ACTION=ignore
1010
ARG DISTRO
1111
RUN pip install --upgrade pip && pip install -r requirements.txt && pip install ${DISTRO} --force-reinstall
12+
RUN pip uninstall opentelemetry-exporter-otlp-proto-grpc -y
13+
RUN pip uninstall grpcio -y
1214
RUN opentelemetry-bootstrap -a install
1315

1416
# Without `-u`, logs will be buffered and `wait_for_logs` will never return.

0 commit comments

Comments
 (0)