Merge branch 'main' into owl-bot-copy-1c8dac272a1e35241540

Author: bshaffer

Core/src/ServiceBuilder.php

@@ -30,7 +30,7 @@
 use Google\Cloud\Speech\SpeechClient as DeprecatedSpeechClient;
 use Google\Cloud\Speech\V2\Client\SpeechClient;
 use Google\Cloud\Storage\StorageClient;
-use Google\Cloud\Trace\TraceClient;
+use Google\Cloud\Trace\V2\Client\TraceServiceClient;
 use Google\Cloud\Translate\V2\TranslateClient as DeprecatedTranslateClient;
 use Google\Cloud\Translate\V3\Client\TranslationServiceClient;
 use Google\Cloud\Vision\V1\Client\ImageAnnotatorClient;
@@ -311,22 +311,16 @@ public function storage(array $config = [])
     }
 
     /**
-     * Google Stackdriver Trace allows you to collect latency data from your applications
-     * and display it in the Google Cloud Platform Console. Find more information at
-     * [Stackdriver Trace API docs](https://cloud.google.com/trace/docs/).
-     *
-     * Example:
-     * ```
-     * $trace = $cloud->trace();
-     * ```
-     *
-     * @param array $config [optional] Configuration options. See
-     *        {@see \Google\Cloud\Core\ServiceBuilder::__construct()} for the available options.
-     * @return TraceClient
+     * @deprecated
+     * @see TraceServiceClient
+     * @throws \BadMethodCallException
      */
     public function trace(array $config = [])
     {
-        return $this->createClient(TraceClient::class, 'trace', $config);
+        throw new \BadMethodCallException(sprintf(
+            'This method is no longer supported, create %s directly instead.',
+            TraceServiceClient::class
+        ));
     }
 
     /**

Core/src/Testing/Reflection/DescriptionFactory.php

@@ -126,8 +126,9 @@ private function lex(string $contents): array
 
         return Utils::pregSplit(
             '/\{
-                # "{@}" is not a valid inline tag. This ensures that we do not treat it as one, but treat it literally.
-                (?!@\})
+                # "{@}" and "{@*}" are not a valid inline tags. This ensures that we do not treat them as one, but treat
+                # them literally.
+                (?!(?:@\}|@\*\}) )
                 # We want to capture the whole tag line, but without the inline tag delimiters.
                 (\@
                     # Match everything up to the next delimiter.

Core/tests/Snippet/ServiceBuilderTest.php

@@ -19,15 +19,13 @@
 
 use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\Core\ServiceBuilder;
-use Google\Cloud\Datastore\DatastoreClient;
 use Google\Cloud\Core\Testing\Snippet\SnippetTestCase;
 use Google\Cloud\Firestore\FirestoreClient;
 use Google\Cloud\Language\LanguageClient;
 use Google\Cloud\Logging\LoggingClient;
 use Google\Cloud\PubSub\PubSubClient;
 use Google\Cloud\Spanner\SpannerClient;
 use Google\Cloud\Storage\StorageClient;
-use Google\Cloud\Trace\TraceClient;
 
 /**
  * @group root
@@ -57,7 +55,6 @@ public function serviceBuilderMethods()
             ['pubsub', PubSubClient::class, 'pubsub'],
             ['spanner', SpannerClient::class, 'spanner', true],
             ['storage', StorageClient::class, 'storage'],
-            ['trace', TraceClient::class, 'trace'],
         ];
     }
 

Core/tests/Unit/ServiceBuilderTest.php

@@ -142,9 +142,6 @@ public function serviceProvider()
             [
                 'bigQuery',
                 BigQueryClient::class
-            ], [
-                'logging',
-                LoggingClient::class
             ], [
                 'language',
                 LanguageClient::class

Core/tests/Unit/ServicesNotFoundTest.php

@@ -75,7 +75,6 @@ private static function getApis()
             "PubSub",
             "Spanner",
             "Storage",
-            "Trace",
             "VideoIntelligence",
         ];
     }
@@ -89,7 +88,6 @@ public function serviceBuilderMethods()
             ['pubsub'],
             ['spanner'],
             ['storage'],
-            ['trace'],
         ];
     }