fixing more broken things

Author: brettmc

src/Instrumentation/Curl/tests/Integration/CurlMultiInstrumentationTest.php

@@ -93,7 +93,7 @@ public function test_curl_multi_error()
 
         $this->assertCount(1, $this->storage);
         $span = $this->storage->offsetGet(0);
-        $this->assertEquals('curl_multi_exec', $span->getAttributes()->get(TraceAttributes::CODE_FUNCTION));
+        $this->assertEquals('curl_multi_exec', $span->getAttributes()->get(TraceAttributes::CODE_FUNCTION_NAME));
         $this->assertEquals('unknown://scheme.com/', actual: $span->getAttributes()->get(TraceAttributes::URL_FULL));
         $this->assertSame('GET', $span->getName());
     }

src/Instrumentation/Laravel/src/Watchers/LogWatcher.php

@@ -9,7 +9,7 @@
 use Illuminate\Log\LogManager;
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Logs\LogRecord;
-use OpenTelemetry\API\Logs\Severity;
+use OpenTelemetry\API\Logs\Map\Psr3;
 use TypeError;
 
 class LogWatcher extends Watcher
@@ -56,9 +56,10 @@ public function recordLog(MessageLogged $log): void
 
         $logger = $this->instrumentation->logger();
 
+        /* @phan-suppressPhanUndeclaredClassMethod */
         $record = (new LogRecord($log->message))
             ->setSeverityText($log->level)
-            ->setSeverityNumber(Severity::fromPsr3($log->level))
+            ->setSeverityNumber(Psr3::severityNumber($log->level))
             ->setAttributes($attributes);
 
         $logger->emit($record);

src/ResourceDetectors/Azure/tests/Unit/AppService/DetectorTest.php

@@ -32,7 +32,7 @@ public function test_valid_app_service_attributes()
             [ResourceAttributes::CLOUD_PROVIDER, null, 'azure'],
             [ResourceAttributes::CLOUD_RESOURCE_ID, Detector::ENV_REGION_NAME_KEY, '/subscriptions/owner_name/resourceGroups/resouce_group/providers/Microsoft.Web/sites/demo-app'],
             [ResourceAttributes::CLOUD_REGION, Detector::ENV_REGION_NAME_KEY, 'westus'],
-            [ResourceAttributes::DEPLOYMENT_ENVIRONMENT, Detector::ENV_WEBSITE_SLOT_NAME_KEY, 'testing'],
+            [ResourceAttributes::DEPLOYMENT_ENVIRONMENT_NAME, Detector::ENV_WEBSITE_SLOT_NAME_KEY, 'testing'],
             [ResourceAttributes::HOST_ID, Detector::ENV_WEBSITE_HOSTNAME_KEY, 'example.com'],
             [ResourceAttributes::SERVICE_INSTANCE_ID, Detector::ENV_WEBSITE_INSTANCE_ID_KEY, uniqid()],
             [ResourceAttributes::SERVICE_NAME, Detector::ENV_WEBSITE_SITE_NAME_KEY, self::SERVICE_NAME],