Feat/apisaas 1496 (#81)

fix(APISAAS-1496): remove deprecated flag
freepik-company · Dec 18, 2024 · 3d4d293 · 3d4d293
1 parent d992750
commit 3d4d293
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/Trace/Builder/Builder.php b/src/Trace/Builder/Builder.php
@@ -239,10 +239,8 @@ public function withDefaultResource(bool $enableAutoDiscover = false): self
             ])
         );
         if ($enableAutoDiscover) {
-            $resourceInfo = ResourceInfoFactory::merge(
-                $resourceInfo,
-                ResourceInfoFactory::defaultResource(),
-            );
+            $currentResource = ResourceInfoFactory::defaultResource();
+            $resourceInfo = $currentResource->merge($resourceInfo);
         }
 
         return $this->withResourceInfo(

diff --git a/src/Trace/Integration/Curl.php b/src/Trace/Integration/Curl.php
@@ -70,7 +70,6 @@ public function getCurlOptName(int $option): string
         return match ($option) {
             CURLOPT_ADDRESS_SCOPE => 'CURLOPT_ADDRESS_SCOPE',
             CURLOPT_AUTOREFERER => 'CURLOPT_AUTOREFERER',
-            CURLOPT_BINARYTRANSFER => 'CURLOPT_BINARYTRANSFER',
             CURLOPT_BUFFERSIZE => 'CURLOPT_BUFFERSIZE',
             CURLOPT_CERTINFO => 'CURLOPT_CERTINFO',
             CURLOPT_CONNECTTIMEOUT => 'CURLOPT_CONNECTTIMEOUT',