OtlpExporter: Integration test testing https support

.github/workflows/integration.yml

@@ -53,4 +53,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Run OTLP Exporter docker-compose.integration
-        run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build
+        run: docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/docker-compose.yml --file=build/docker-compose.${{ matrix.version }}.yml --project-directory=. up --exit-code-from=tests --build

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/IntegrationTests.cs

@@ -40,7 +40,8 @@ public void ExportResultIsSuccess()
 
             var exporterOptions = new OtlpExporterOptions
             {
-                Endpoint = new System.Uri($"http://{CollectorEndpoint}"),
+                // TODO: Should test both http and https
+                Endpoint = new System.Uri($"https://{CollectorEndpoint}"),
             };
 
             var otlpExporter = new OtlpTraceExporter(exporterOptions);

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/.gitignore

@@ -0,0 +1,3 @@
+# Self-signed cert generated by integration test
+otel-collector.crt
+otel-collector.key

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile → test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/Dockerfile

@@ -14,4 +14,8 @@ RUN dotnet publish "OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.csproj" -
 FROM mcr.microsoft.com/dotnet/sdk:${SDK_VERSION} AS final
 WORKDIR /test
 COPY --from=build /drop .
-ENTRYPOINT ["dotnet", "vstest", "OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.dll"]
+
+RUN apt-get update && apt-get install ca-certificates
+
+# This is for testing https when using the Google gRPC library (apps prior to .NET Core 3.0).
+ENV GRPC_DEFAULT_SSL_ROOTS_FILE_PATH /usr/local/share/ca-certificates/otel-collector.crt

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/create-cert.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# Generate self-signed certificate for the collector
+openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 \
+    -subj "/CN=otel-collector" \
+    -keyout /otel-collector.key  -out /otel-collector.crt
+
+# Copy the certificate and private key file to shared volume that the collector
+# container and test container can access
+cp /otel-collector.crt /otel-collector.key /cfg
+
+# The integration test is run via docker-compose with the --exit-code-from
+# option. The --exit-code-from option implies --abort-on-container-exit
+# which means when any container exits then all containers are stopped.
+# Since the container running this script would be otherwise short-lived
+# we sleep here. If the test does not finish within this time then the test
+# container will be stopped and have a non-zero exit code.
+sleep 300

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml → test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/docker-compose.yml

@@ -1,23 +1,33 @@
 # Starts an OpenTelemetry Collector and then runs the OTLP exporter integration tests.
 # This should be run from the root of the repo:
-#    docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
+#    docker-compose --file=test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/docker-compose.yml --project-directory=. up --exit-code-from=tests --build
 
 version: '3.7'
 
 services:
+  create-cert:
+    image: mcr.microsoft.com/dotnet/sdk:5.0-focal
+    volumes:
+      - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test:/cfg
+    command: /cfg/create-cert.sh
+
   otel-collector:
     image: otel/opentelemetry-collector
     volumes:
-      - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests:/cfg
-    command: --config=/cfg/config.yaml
+      - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test:/cfg
+    command: --config=/cfg/otel-collector-config.yaml
     ports:
       - "4317:4317"
+    depends_on:
+      - create-cert
 
   tests:
     build:
       context: .
-      dockerfile: ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/Dockerfile
-    command: --TestCaseFilter:CategoryName=CollectorIntegrationTests
+      dockerfile: ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/Dockerfile
+    volumes:
+      - ./test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test:/cfg
+    command: /cfg/run-test.sh
     environment:
       - OTEL_EXPORTER_OTLP_ENDPOINT=otel-collector:4317
     depends_on:

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/config.yaml → test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/otel-collector-config.yaml

@@ -8,6 +8,9 @@ receivers:
   otlp:
     protocols:
       grpc:
+        tls_settings:
+          cert_file: /cfg/otel-collector.crt
+          key_file: /cfg/otel-collector.key
 
 exporters:
   logging:

test/OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests/integration-test/run-test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Trust the self-signed certificated used by the collector
+cp /cfg/otel-collector.crt /usr/local/share/ca-certificates/
+update-ca-certificates --verbose
+
+dotnet vstest OpenTelemetry.Exporter.OpenTelemetryProtocol.Tests.dll --TestCaseFilter:CategoryName=CollectorIntegrationTests