allow 2.x versions of packages (#1472)

open-telemetry · Jan 9, 2025 · 81288cd · 81288cd
1 parent c6f742d
commit 81288cd
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/src/API/composer.json b/src/API/composer.json
@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "open-telemetry/context": "^1.0",
+        "open-telemetry/context": "^1.0|^2.0",
         "psr/log": "^1.1|^2.0|^3.0"
     },
     "conflict": {

diff --git a/src/Config/SDK/composer.json b/src/Config/SDK/composer.json
@@ -18,8 +18,8 @@
     ],
     "require": {
         "php": "^8.2",
-        "open-telemetry/context": "^1.0",
-        "open-telemetry/sdk": "^1.0",
+        "open-telemetry/context": "^1.0|^2.0",
+        "open-telemetry/sdk": "^1.0|^2.0",
         "symfony/config": "^6.4 || ^7.0",
         "tbachert/spi": "^1.0.1"
     },

diff --git a/src/Contrib/Grpc/composer.json b/src/Contrib/Grpc/composer.json
@@ -20,7 +20,8 @@
     "php": "^8.2",
     "ext-grpc": "*",
     "grpc/grpc": "*",
-    "open-telemetry/sdk": "^1.0"
+    "open-telemetry/sdk": "^1.0|^2.0",
+    "open-telemetry/exporter-otlp": "^1.0|^2.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Contrib/Otlp/composer.json b/src/Contrib/Otlp/composer.json
@@ -20,8 +20,8 @@
     "php": "^8.2",
     "php-http/discovery": "^1.14",
     "open-telemetry/gen-otlp-protobuf": "^1.1",
-    "open-telemetry/api": "^1.0",
-    "open-telemetry/sdk": "^1.0"
+    "open-telemetry/api": "^1.0|^2.0",
+    "open-telemetry/sdk": "^1.0|^2.0"
   },
   "suggest": {
   },

diff --git a/src/Contrib/Zipkin/composer.json b/src/Contrib/Zipkin/composer.json
@@ -18,8 +18,8 @@
   ],
   "require": {
     "php": "^8.2",
-    "open-telemetry/api": "^1.0",
-    "open-telemetry/sdk": "^1.0",
+    "open-telemetry/api": "^1.0|^2.0",
+    "open-telemetry/sdk": "^1.0|^2.0",
     "php-http/async-client-implementation": "^1.0",
     "php-http/discovery": "^1.14",
     "psr/http-factory-implementation": "^1.0"

diff --git a/src/Extension/Propagator/B3/composer.json b/src/Extension/Propagator/B3/composer.json
@@ -18,8 +18,8 @@
     ],
     "require": {
         "php": "^8.2",
-        "open-telemetry/api": "^1.0",
-        "open-telemetry/context": "^1.0"
+        "open-telemetry/api": "^1.0|^2.0",
+        "open-telemetry/context": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Extension/Propagator/CloudTrace/composer.json b/src/Extension/Propagator/CloudTrace/composer.json
@@ -18,8 +18,8 @@
     ],
     "require": {
         "php": "^8.2",
-        "open-telemetry/api": "^1.0",
-        "open-telemetry/context": "^1.0"
+        "open-telemetry/api": "^1.0|^2.0",
+        "open-telemetry/context": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Extension/Propagator/Jaeger/composer.json b/src/Extension/Propagator/Jaeger/composer.json
@@ -18,8 +18,8 @@
     ],
     "require": {
         "php": "^8.2",
-        "open-telemetry/api": "^1.0",
-        "open-telemetry/context": "^1.0"
+        "open-telemetry/api": "^1.0|^2.0",
+        "open-telemetry/context": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/SDK/composer.json b/src/SDK/composer.json
@@ -20,8 +20,8 @@
         "php": "^8.2",
         "ext-json": "*",
         "nyholm/psr7-server": "^1.1",
-        "open-telemetry/api": "^1.0",
-        "open-telemetry/context": "^1.0",
+        "open-telemetry/api": "^1.0|^2.0",
+        "open-telemetry/context": "^1.0|^2.0",
         "open-telemetry/sem-conv": "^1.0",
         "php-http/discovery": "^1.14",
         "psr/http-client-implementation": "^1.0",