Merge branch 'open-telemetry:main' into main

Author: HeenaBansal20

.github/dependabot.yml

@@ -92,6 +92,7 @@ updates:
       - "/src/Instrumentation/Yii"
       - "/src/Logs/Monolog"
       - "/src/MetaPackages/opentelemetry"
+      - "/src/Propagation/CloudTrace"
       - "/src/Propagation/Instana"
       - "/src/Propagation/ServerTiming"
       - "/src/Propagation/TraceResponse"

.github/workflows/php.yml

@@ -54,6 +54,7 @@ jobs:
           'Instrumentation/Symfony',
           'Instrumentation/Yii',
           'Logs/Monolog',
+          'Propagation/CloudTrace',
           'Propagation/Instana',
           'Propagation/ServerTiming',
           'Propagation/TraceResponse',

.gitsplit.yml

@@ -72,6 +72,8 @@ splits:
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-logger-monolog.git"
   - prefix: "src/MetaPackages/opentelemetry"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/opentelemetry-meta.git"
+  - prefix: "src/Propagation/CloudTrace"
+    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-cloudtrace.git"
   - prefix: "src/Propagation/Instana"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-instana.git"
   - prefix: "src/Propagation/ServerTiming"

composer.json

@@ -45,6 +45,7 @@
       "OpenTelemetry\\Contrib\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/src",
       "OpenTelemetry\\Contrib\\Instrumentation\\Yii\\": "src/Instrumentation/Yii/src",
       "OpenTelemetry\\Contrib\\Logs\\Monolog\\": "src/Logs/Monolog/src",
+      "OpenTelemetry\\Contrib\\Propagation\\CloudTrace\\": "src/Propagation/CloudTrace/src",
       "OpenTelemetry\\Contrib\\Propagation\\Instana\\": "src/Propagation/Instana/src",
       "OpenTelemetry\\Contrib\\Propagation\\ServerTiming\\": "src/Propagation/ServerTiming/src",
       "OpenTelemetry\\Contrib\\Propagation\\TraceResponse\\": "src/Propagation/TraceResponse/src",
@@ -84,6 +85,7 @@
       "src/Instrumentation/Symfony/_register.php",
       "src/Instrumentation/Wordpress/_register.php",
       "src/Instrumentation/Yii/_register.php",
+      "src/Propagation/CloudTrace/_register.php",
       "src/Propagation/Instana/_register.php",
       "src/ResourceDetectors/Azure/_register.php",
       "src/ResourceDetectors/Container/_register.php",
@@ -117,6 +119,7 @@
       "OpenTelemetry\\Tests\\Instrumentation\\Symfony\\tests\\": "src/Instrumentation/Symfony/tests",
       "OpenTelemetry\\Tests\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/tests",
       "OpenTelemetry\\Tests\\Instrumentation\\Yii\\": "src/Instrumentation/Yii/tests",
+      "OpenTelemetry\\Tests\\Propagation\\CloudTrace\\": "src/Propagation/CloudTrace/tests",
       "OpenTelemetry\\Tests\\Resource\\Detector\\Azure\\": "src/ResourceDetectors/Azure/tests",
       "OpenTelemetry\\Contrib\\Resource\\Detector\\DigitalOcean\\": "src/ResourceDetectors/DigitalOcean/tests",
       "OpenTelemetry\\Tests\\Contrib\\Symfony\\": "src/Symfony/tests",
@@ -160,6 +163,7 @@
     "open-telemetry/opentelemetry-exporter-instana": "self.version",
     "open-telemetry/opentelemetry-instrumentation-installer": "self.version",
     "open-telemetry/opentelemetry-logger-monolog": "self.version",
+    "open-telemetry/opentelemetry-propagation-cloudtrace": "self.version",
     "open-telemetry/opentelemetry-propagation-instana": "self.version",
     "open-telemetry/opentelemetry-propagation-server-timing": "self.version",
     "open-telemetry/opentelemetry-propagation-traceresponse": "self.version",

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"

docker/Dockerfile

@@ -1,9 +1,9 @@
 # Pull in dependencies with composer
-FROM composer:2.5 as build
+FROM composer:2.8 as build
 COPY composer.json ./
 RUN composer install --ignore-platform-reqs
 
-FROM wordpress:6.7.1
+FROM wordpress:6.8
 # Install the opentelemetry and protobuf extensions
 RUN pecl install opentelemetry protobuf
 COPY otel.php.ini $PHP_INI_DIR/conf.d/.

examples/instrumentation/Wordpress/autoinstrumented-wordpress.dockerfile

@@ -42,7 +42,7 @@ services:
   # OpenTelemetry collector. Make sure you set USERID and GOOGLE_APPLICATION_CREDENTIALS
   # environment variables for your container to authenticate correctly
   otel-collector:
-    image: otel/opentelemetry-collector-contrib:0.91.0
+    image: otel/opentelemetry-collector-contrib:0.132.0
     volumes:
       - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml
 

examples/instrumentation/Wordpress/compose.yaml

@@ -5,13 +5,14 @@
 	"minimum-stability": "beta",
 	"require": {
 		"open-telemetry/opentelemetry-auto-wordpress": "^0.0.16",
-		"open-telemetry/sdk": "^1.1",
-		"open-telemetry/exporter-otlp": "^1.1",
+		"open-telemetry/sdk": "^1.7",
+		"open-telemetry/exporter-otlp": "^1.3",
 		"php-http/guzzle7-adapter": "^1.1"
 	},
 	"config": {
 		"allow-plugins": {
-			"php-http/discovery": true
+			"php-http/discovery": true,
+			"tbachert/spi": true
 		}
 	}
 }

examples/instrumentation/Wordpress/composer.json

@@ -2,6 +2,7 @@ receivers:
   otlp:
     protocols:
       http:
+        endpoint: 0.0.0.0:4318
 
 processors:
   batch: