Fixing protobuf generation and InstrumentationScope

.phan/config.php

@@ -359,10 +359,12 @@
     // your application should be included in this list.
     'directory_list' => [
         'src',
-        'proto',
+        'proto/otel/GPBMetadata',
+        'proto/otel/Opentelemetry',
         'thrift',
         'vendor/packaged/thrift',
         'vendor/composer',
+        'vendor/grpc/grpc/src/lib',
         'vendor/guzzlehttp',
         'vendor/psr',
         'vendor/php-http',

Makefile

@@ -24,7 +24,7 @@ psalm:
 psalm-info:
 	$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/psalm --show-info=true --threads=1
 phpstan:
-	$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpstan analyse
+	$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpstan analyse --memory-limit=256M
 benchmark:
 	$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpbench run --report=default
 phpmetrics:
@@ -39,9 +39,9 @@ trace examples: FORCE
 	docker-compose run -e NEW_RELIC_ENDPOINT -e NEW_RELIC_INSERT_KEY --rm php php ./examples/AlwaysOnZipkinToNewrelicExample.php
 	docker-compose stop
 collector:
-	docker-compose -f docker-compose-collector.yaml up -d --remove-orphans
-	docker-compose -f docker-compose-collector.yaml run -e OTEL_EXPORTER_OTLP_ENDPOINT=otel-collector:4317 --rm php php ./examples/AlwaysOnOTLPGrpcExample2.php
-	docker-compose -f docker-compose-collector.yaml stop
+	docker-compose -f docker-compose.collector.yaml up -d --remove-orphans
+	docker-compose -f docker-compose.collector.yaml run -e OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317 --rm php php ./examples/AlwaysOnOTLPGrpcExample.php
+	docker-compose -f docker-compose.collector.yaml stop
 
 fiber-ffi-example:
 	@docker-compose -f docker-compose.fiber-ffi.yaml -p opentelemetry-php_fiber-ffi-example up -d web
@@ -51,7 +51,7 @@ metrics-prometheus-example:
 stop-prometheus:
 	@docker-compose -f docker-compose.prometheus.yaml -p opentelemetry-php_metrics-prometheus-example stop
 protobuf:
-	@docker-compose -f docker-compose.proto.yaml up proto
+	./script/proto_gen.sh
 thrift:
 	./script/thrift_gen.sh
 bash:

README.md

@@ -205,9 +205,8 @@ To generate protobuf files for use with this repository, you can run the followi
 make protobuf
 ```
 
-Change into the root of this directory.  This will create a `/proto` folder in the root
-directory of the
-repository.
+This will replace `proto/otel/Opentelemetry` and `proto/otel/GPBMetadata` with freshly generated code based on the latest
+tag from `opentelemetry-proto`, which can then be committed.
 
 
 ## Semantic Conventions Generation

docker-compose-collector.yaml → docker-compose.collector.yaml

@@ -7,7 +7,7 @@ services:
     volumes:
     - ./:/usr/src/myapp
     depends_on:
-      - otel-collector
+      - collector
   zipkin:
     image: openzipkin/zipkin-slim
     ports:
@@ -19,8 +19,7 @@ services:
     ports:
     - 9412:9412
     - 16686:16686
-  otel-collector:
-    platform: linux/amd64
+  collector:
     image: otel/opentelemetry-collector-contrib
     command: ["--config=/etc/otel-collector-config.yml"]
     volumes:

proto/otel/.gitignore

@@ -0,0 +1 @@
+opentelemetry-proto

proto/otel/Opentelemetry/Proto/Collector/Logs/V1/LogsServiceClient.php

@@ -40,6 +40,7 @@ public function __construct($hostname, $opts, $channel = null) {
      * @param \Opentelemetry\Proto\Collector\Logs\V1\ExportLogsServiceRequest $argument input argument
      * @param array $metadata metadata
      * @param array $options call options
+     * @return \Grpc\UnaryCall
      */
     public function Export(\Opentelemetry\Proto\Collector\Logs\V1\ExportLogsServiceRequest $argument,
       $metadata = [], $options = []) {

proto/otel/Opentelemetry/Proto/Collector/Metrics/V1/MetricsServiceClient.php

@@ -40,6 +40,7 @@ public function __construct($hostname, $opts, $channel = null) {
      * @param \Opentelemetry\Proto\Collector\Metrics\V1\ExportMetricsServiceRequest $argument input argument
      * @param array $metadata metadata
      * @param array $options call options
+     * @return \Grpc\UnaryCall
      */
     public function Export(\Opentelemetry\Proto\Collector\Metrics\V1\ExportMetricsServiceRequest $argument,
       $metadata = [], $options = []) {

proto/otel/Opentelemetry/Proto/Collector/Trace/V1/TraceServiceClient.php

@@ -40,6 +40,7 @@ public function __construct($hostname, $opts, $channel = null) {
      * @param \Opentelemetry\Proto\Collector\Trace\V1\ExportTraceServiceRequest $argument input argument
      * @param array $metadata metadata
      * @param array $options call options
+     * @return \Grpc\UnaryCall
      */
     public function Export(\Opentelemetry\Proto\Collector\Trace\V1\ExportTraceServiceRequest $argument,
       $metadata = [], $options = []) {