From b65b0637bf76fa45fb89f044aabe0cbfcec5ef2f Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Thu, 29 Aug 2024 14:48:59 +0900
Subject: [PATCH] Issue #3470235 by Spokje, catch:
open-telemetry/sem-conv:1.27.0 introduces new deprecation, breaks daily
updated deps run
---
composer.lock | 10 +++++-----
.../Metapackage/PinnedDevDependencies/composer.json | 2 +-
core/tests/Drupal/Tests/PerformanceTestTrait.php | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/composer.lock b/composer.lock
index 7e39a2777f41..b9609ebfe5f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -6285,16 +6285,16 @@
},
{
"name": "open-telemetry/sem-conv",
- "version": "1.25.0",
+ "version": "1.27.1",
"source": {
"type": "git",
"url": "https://github.com/opentelemetry-php/sem-conv.git",
- "reference": "23f457ba390847647a17068e0095d9ffe9a4824c"
+ "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/23f457ba390847647a17068e0095d9ffe9a4824c",
- "reference": "23f457ba390847647a17068e0095d9ffe9a4824c",
+ "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/1dba705fea74bc0718d04be26090e3697e56f4e6",
+ "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6",
"shasum": ""
},
"require": {
@@ -6338,7 +6338,7 @@
"issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
"source": "https://github.com/open-telemetry/opentelemetry-php"
},
- "time": "2024-04-09T23:31:35+00:00"
+ "time": "2024-08-28T09:20:31+00:00"
},
{
"name": "phar-io/manifest",
diff --git a/composer/Metapackage/PinnedDevDependencies/composer.json b/composer/Metapackage/PinnedDevDependencies/composer.json
index 278ae096f634..e160bb13f2eb 100644
--- a/composer/Metapackage/PinnedDevDependencies/composer.json
+++ b/composer/Metapackage/PinnedDevDependencies/composer.json
@@ -35,7 +35,7 @@
"open-telemetry/exporter-otlp": "1.0.4",
"open-telemetry/gen-otlp-protobuf": "1.1.0",
"open-telemetry/sdk": "1.0.8",
- "open-telemetry/sem-conv": "1.25.0",
+ "open-telemetry/sem-conv": "1.27.1",
"phar-io/manifest": "2.0.4",
"phar-io/version": "3.2.1",
"php-http/discovery": "1.19.4",
diff --git a/core/tests/Drupal/Tests/PerformanceTestTrait.php b/core/tests/Drupal/Tests/PerformanceTestTrait.php
index ed85aafb78d0..9545a2996646 100644
--- a/core/tests/Drupal/Tests/PerformanceTestTrait.php
+++ b/core/tests/Drupal/Tests/PerformanceTestTrait.php
@@ -472,7 +472,7 @@ private function openTelemetryTracing(array $messages, string $service_name): vo
ResourceAttributes::SERVICE_NAME => $service_name,
ResourceAttributes::SERVICE_INSTANCE_ID => 1,
ResourceAttributes::SERVICE_VERSION => \Drupal::VERSION,
- ResourceAttributes::DEPLOYMENT_ENVIRONMENT => 'local',
+ ResourceAttributes::DEPLOYMENT_ENVIRONMENT_NAME => 'local',
])));
$otel_collector_headers = getenv('OTEL_COLLECTOR_HEADERS') ?: [];
--
GitLab