diff --git a/docker-compose.yaml b/docker-compose.yaml index 52746f6dd..a41f04f55 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,11 +1,7 @@ services: php: - image: opentelemetry-php:local-${PHP_VERSION}-cli - build: - context: ./docker - dockerfile: Dockerfile - args: - - PHP_VERSION:${PHP_VERSION} + # the developer image comes from opentelemetry-php (the core repository), and is built by github actions + image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION} volumes: - ./:/usr/src/myapp user: "${PHP_USER}:root" diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 2e30b0bdd..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -ARG PHP_VERSION=8.1 -FROM ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION} - -USER root - -RUN install-php-extensions \ - opentelemetry \ - mongodb \ - amqp \ - rdkafka \ - mysqli \ - pgsql - -USER php diff --git a/files/collector/otel-collector-config.yml b/files/collector/otel-collector-config.yml index db6d243c1..879e4abae 100644 --- a/files/collector/otel-collector-config.yml +++ b/files/collector/otel-collector-config.yml @@ -2,13 +2,15 @@ receivers: otlp: protocols: grpc: + endpoint: "0.0.0.0:4317" http: + endpoint: "0.0.0.0:4318" zipkin: exporters: zipkin: endpoint: "http://zipkin:9411/api/v2/spans" - logging: + debug: verbosity: detailed processors: @@ -27,12 +29,12 @@ service: pipelines: traces: receivers: [otlp, zipkin] - exporters: [logging] + exporters: [debug] processors: [batch] metrics: receivers: [otlp] - exporters: [logging] + exporters: [debug] logs: receivers: [ otlp ] processors: [ batch ] - exporters: [ logging ] + exporters: [ debug ]