diff --git a/.github/workflows/main_build.yml b/.github/workflows/main_build.yml index e574f8bf6..56f365786 100644 --- a/.github/workflows/main_build.yml +++ b/.github/workflows/main_build.yml @@ -5,6 +5,10 @@ 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 diff --git a/Dockerfile b/Dockerfile index a0192e5be..8d7fab445 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,8 @@ 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 diff --git a/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py b/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py index 2e9963e81..b00593d90 100644 --- a/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py +++ b/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py @@ -17,7 +17,6 @@ ) 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, @@ -302,6 +301,10 @@ def create_exporter(self): endpoint=application_signals_endpoint, preferred_temporality=temporality_dict ) if protocol == "grpc": + from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import ( + OTLPMetricExporter as OTLPGrpcOTLPMetricExporter, + ) + return OTLPGrpcOTLPMetricExporter( endpoint=application_signals_endpoint, preferred_temporality=temporality_dict )