diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index 45604b0aa..34a12f5a9 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -6,7 +6,8 @@ - The `IgnoreErrorsIntegration` integration was removed. Use the `ignore_errors` option instead. - `Sentry\Exception\InvalidArgumentException` was removed. Use `\InvalidArgumentException` instead. - `Sentry\Exception/ExceptionInterface` was removed. -- Removed `ClientBuilderInterface::setSerializer()` -- Removed `ClientBuilder::setSerializer()` +- Removed `ClientBuilderInterface::setSerializer()`. +- Removed `ClientBuilder::setSerializer()`. - Removed `Client::__construct()` param SerializerInterface $serializer. -- Change return type of `Dsn:: getProjectId()` to string +- Change return type of `Dsn:: getProjectId()` to string. +- Most setters now return `$this` instead of `void`. diff --git a/src/CheckIn.php b/src/CheckIn.php index f49e83a7d..1a0eafbe5 100644 --- a/src/CheckIn.php +++ b/src/CheckIn.php @@ -80,9 +80,11 @@ public function getMonitorSlug(): string return $this->monitorSlug; } - public function setMonitorSlug(string $monitorSlug): void + public function setMonitorSlug(string $monitorSlug): self { $this->monitorSlug = $monitorSlug; + + return $this; } public function getStatus(): CheckInStatus @@ -90,9 +92,11 @@ public function getStatus(): CheckInStatus return $this->status; } - public function setStatus(CheckInStatus $status): void + public function setStatus(CheckInStatus $status): self { $this->status = $status; + + return $this; } public function getRelease(): ?string @@ -100,9 +104,11 @@ public function getRelease(): ?string return $this->release; } - public function setRelease(string $release): void + public function setRelease(string $release): self { $this->release = $release; + + return $this; } public function getEnvironment(): ?string @@ -110,9 +116,11 @@ public function getEnvironment(): ?string return $this->environment; } - public function setEnvironment(string $environment): void + public function setEnvironment(string $environment): self { $this->environment = $environment; + + return $this; } /** @@ -126,9 +134,11 @@ public function getDuration() /** * @param int|float|null $duration The duration of the check-in in seconds */ - public function setDuration($duration): void + public function setDuration($duration): self { $this->duration = $duration; + + return $this; } public function getMonitorConfig(): ?MonitorConfig @@ -136,8 +146,10 @@ public function getMonitorConfig(): ?MonitorConfig return $this->monitorConfig; } - public function setMonitorConfig(?MonitorConfig $monitorConfig): void + public function setMonitorConfig(?MonitorConfig $monitorConfig): self { $this->monitorConfig = $monitorConfig; + + return $this; } } diff --git a/src/ClientBuilder.php b/src/ClientBuilder.php index 680ff73c6..0594ba08e 100644 --- a/src/ClientBuilder.php +++ b/src/ClientBuilder.php @@ -75,7 +75,7 @@ public function __construct(?Options $options = null) /** * @param array $options The client options, in naked array form */ - public static function create(array $options = []): ClientBuilder + public static function create(array $options = []): self { return new self(new Options($options)); } @@ -85,28 +85,28 @@ public function getOptions(): Options return $this->options; } - public function setRepresentationSerializer(RepresentationSerializerInterface $representationSerializer): ClientBuilder + public function setRepresentationSerializer(RepresentationSerializerInterface $representationSerializer): self { $this->representationSerializer = $representationSerializer; return $this; } - public function setLogger(LoggerInterface $logger): ClientBuilder + public function setLogger(LoggerInterface $logger): self { $this->logger = $logger; return $this; } - public function setSdkIdentifier(string $sdkIdentifier): ClientBuilder + public function setSdkIdentifier(string $sdkIdentifier): self { $this->sdkIdentifier = $sdkIdentifier; return $this; } - public function setSdkVersion(string $sdkVersion): ClientBuilder + public function setSdkVersion(string $sdkVersion): self { $this->sdkVersion = $sdkVersion; @@ -118,7 +118,7 @@ public function getTransport(): TransportInterface return $this->transport; } - public function setTransport(TransportInterface $transport): ClientBuilder + public function setTransport(TransportInterface $transport): self { $this->transport = $transport; @@ -130,7 +130,7 @@ public function getHttpClient(): HttpClientInterface return $this->httpClient; } - public function setHttpClient(HttpClientInterface $httpClient): ClientBuilder + public function setHttpClient(HttpClientInterface $httpClient): self { $this->httpClient = $httpClient; diff --git a/src/Event.php b/src/Event.php index 57d7d0991..b9fd06e27 100644 --- a/src/Event.php +++ b/src/Event.php @@ -233,9 +233,11 @@ public function getSdkIdentifier(): string * * @internal */ - public function setSdkIdentifier(string $sdkIdentifier): void + public function setSdkIdentifier(string $sdkIdentifier): self { $this->sdkIdentifier = $sdkIdentifier; + + return $this; } /** @@ -253,9 +255,11 @@ public function getSdkVersion(): string * * @internal */ - public function setSdkVersion(string $sdkVersion): void + public function setSdkVersion(string $sdkVersion): self { $this->sdkVersion = $sdkVersion; + + return $this; } /** @@ -269,9 +273,11 @@ public function getTimestamp(): ?float /** * Sets the timestamp of when the Event was created. */ - public function setTimestamp(?float $timestamp): void + public function setTimestamp(?float $timestamp): self { $this->timestamp = $timestamp; + + return $this; } /** @@ -287,9 +293,11 @@ public function getLevel(): ?Severity * * @param Severity|null $level The severity */ - public function setLevel(?Severity $level): void + public function setLevel(?Severity $level): self { $this->level = $level; + + return $this; } /** @@ -305,9 +313,11 @@ public function getLogger(): ?string * * @param string|null $logger The logger name */ - public function setLogger(?string $logger): void + public function setLogger(?string $logger): self { $this->logger = $logger; + + return $this; } /** @@ -325,14 +335,11 @@ public function getTransaction(): ?string * * @param string|null $transaction The transaction name */ - public function setTransaction(?string $transaction): void + public function setTransaction(?string $transaction): self { $this->transaction = $transaction; - } - public function setCheckIn(?CheckIn $checkIn): void - { - $this->checkIn = $checkIn; + return $this; } public function getCheckIn(): ?CheckIn @@ -340,6 +347,13 @@ public function getCheckIn(): ?CheckIn return $this->checkIn; } + public function setCheckIn(?CheckIn $checkIn): self + { + $this->checkIn = $checkIn; + + return $this; + } + /** * Gets the name of the server. */ @@ -353,9 +367,11 @@ public function getServerName(): ?string * * @param string|null $serverName The server name */ - public function setServerName(?string $serverName): void + public function setServerName(?string $serverName): self { $this->serverName = $serverName; + + return $this; } /** @@ -371,9 +387,11 @@ public function getRelease(): ?string * * @param string|null $release The release */ - public function setRelease(?string $release): void + public function setRelease(?string $release): self { $this->release = $release; + + return $this; } /** @@ -409,11 +427,13 @@ public function getMessageParams(): array * @param string[] $params The parameters to use to format the message * @param string|null $formatted The formatted message */ - public function setMessage(string $message, array $params = [], ?string $formatted = null): void + public function setMessage(string $message, array $params = [], ?string $formatted = null): self { $this->message = $message; $this->messageParams = $params; $this->messageFormatted = $formatted; + + return $this; } /** @@ -431,9 +451,11 @@ public function getModules(): array * * @param array $modules */ - public function setModules(array $modules): void + public function setModules(array $modules): self { $this->modules = $modules; + + return $this; } /** @@ -451,9 +473,11 @@ public function getRequest(): array * * @param array $request The request data */ - public function setRequest(array $request): void + public function setRequest(array $request): self { $this->request = $request; + + return $this; } /** @@ -496,9 +520,11 @@ public function getExtra(): array * * @param array $extra The context object */ - public function setExtra(array $extra): void + public function setExtra(array $extra): self { $this->extra = $extra; + + return $this; } /** @@ -516,9 +542,11 @@ public function getTags(): array * * @param array $tags The tags to set */ - public function setTags(array $tags): void + public function setTags(array $tags): self { $this->tags = $tags; + + return $this; } /** @@ -527,9 +555,11 @@ public function setTags(array $tags): void * @param string $key The key that uniquely identifies the tag * @param string $value The value */ - public function setTag(string $key, string $value): void + public function setTag(string $key, string $value): self { $this->tags[$key] = $value; + + return $this; } /** @@ -537,9 +567,11 @@ public function setTag(string $key, string $value): void * * @param string $key The key that uniquely identifies the tag */ - public function removeTag(string $key): void + public function removeTag(string $key): self { unset($this->tags[$key]); + + return $this; } /** @@ -555,9 +587,11 @@ public function getUser(): ?UserDataBag * * @param UserDataBag|null $user The context object */ - public function setUser(?UserDataBag $user): void + public function setUser(?UserDataBag $user): self { $this->user = $user; + + return $this; } /** @@ -573,9 +607,11 @@ public function getOsContext(): ?OsContext * * @param OsContext|null $osContext The context object */ - public function setOsContext(?OsContext $osContext): void + public function setOsContext(?OsContext $osContext): self { $this->osContext = $osContext; + + return $this; } /** @@ -591,9 +627,11 @@ public function getRuntimeContext(): ?RuntimeContext * * @param RuntimeContext|null $runtimeContext The context object */ - public function setRuntimeContext(?RuntimeContext $runtimeContext): void + public function setRuntimeContext(?RuntimeContext $runtimeContext): self { $this->runtimeContext = $runtimeContext; + + return $this; } /** @@ -613,9 +651,11 @@ public function getFingerprint(): array * * @param string[] $fingerprint The strings */ - public function setFingerprint(array $fingerprint): void + public function setFingerprint(array $fingerprint): self { $this->fingerprint = $fingerprint; + + return $this; } /** @@ -631,9 +671,11 @@ public function getEnvironment(): ?string * * @param string|null $environment The name of the environment */ - public function setEnvironment(?string $environment): void + public function setEnvironment(?string $environment): self { $this->environment = $environment; + + return $this; } /** @@ -651,9 +693,11 @@ public function getBreadcrumbs(): array * * @param Breadcrumb[] $breadcrumbs The breadcrumb array */ - public function setBreadcrumb(array $breadcrumbs): void + public function setBreadcrumb(array $breadcrumbs): self { $this->breadcrumbs = $breadcrumbs; + + return $this; } /** @@ -671,7 +715,7 @@ public function getExceptions(): array * * @param ExceptionDataBag[] $exceptions The exceptions */ - public function setExceptions(array $exceptions): void + public function setExceptions(array $exceptions): self { foreach ($exceptions as $exception) { if (!$exception instanceof ExceptionDataBag) { @@ -680,6 +724,8 @@ public function setExceptions(array $exceptions): void } $this->exceptions = $exceptions; + + return $this; } /** @@ -695,9 +741,11 @@ public function getStacktrace(): ?Stacktrace * * @param Stacktrace|null $stacktrace The stacktrace instance */ - public function setStacktrace(?Stacktrace $stacktrace): void + public function setStacktrace(?Stacktrace $stacktrace): self { $this->stacktrace = $stacktrace; + + return $this; } public function getType(): EventType @@ -711,9 +759,11 @@ public function getType(): EventType * @param string $name The name that uniquely identifies the SDK metadata * @param mixed $data The data of the SDK metadata */ - public function setSdkMetadata(string $name, $data): void + public function setSdkMetadata(string $name, $data): self { $this->sdkMetadata[$name] = $data; + + return $this; } /** @@ -749,9 +799,11 @@ public function getStartTimestamp(): ?float * * @param float|null $startTimestamp The start time of the measurement */ - public function setStartTimestamp(?float $startTimestamp): void + public function setStartTimestamp(?float $startTimestamp): self { $this->startTimestamp = $startTimestamp; + + return $this; } /** @@ -769,14 +821,11 @@ public function getSpans(): array * * @param Span[] $spans The list of spans */ - public function setSpans(array $spans): void + public function setSpans(array $spans): self { $this->spans = $spans; - } - public function setProfile(?Profile $profile): void - { - $this->profile = $profile; + return $this; } public function getProfile(): ?Profile @@ -784,6 +833,13 @@ public function getProfile(): ?Profile return $this->profile; } + public function setProfile(?Profile $profile): self + { + $this->profile = $profile; + + return $this; + } + public function getTraceId(): ?string { $traceId = $this->getContexts()['trace']['trace_id']; diff --git a/src/ExceptionDataBag.php b/src/ExceptionDataBag.php index e93b6c617..3bdd36d4d 100644 --- a/src/ExceptionDataBag.php +++ b/src/ExceptionDataBag.php @@ -53,9 +53,11 @@ public function getType(): string * * @param string $type The exception type */ - public function setType(string $type): void + public function setType(string $type): self { $this->type = $type; + + return $this; } /** @@ -69,9 +71,11 @@ public function getValue(): string /** * Sets the value of the exception. */ - public function setValue(string $value): void + public function setValue(string $value): self { $this->value = $value; + + return $this; } /** @@ -87,9 +91,11 @@ public function getStacktrace(): ?Stacktrace * * @param Stacktrace $stacktrace The stacktrace */ - public function setStacktrace(Stacktrace $stacktrace): void + public function setStacktrace(Stacktrace $stacktrace): self { $this->stacktrace = $stacktrace; + + return $this; } /** @@ -105,8 +111,10 @@ public function getMechanism(): ?ExceptionMechanism * * @param ExceptionMechanism|null $mechanism The mechanism that created this exception */ - public function setMechanism(?ExceptionMechanism $mechanism): void + public function setMechanism(?ExceptionMechanism $mechanism): self { $this->mechanism = $mechanism; + + return $this; } } diff --git a/src/ExceptionMechanism.php b/src/ExceptionMechanism.php index 9a3cf23ee..fed2081b1 100644 --- a/src/ExceptionMechanism.php +++ b/src/ExceptionMechanism.php @@ -83,8 +83,10 @@ public function getData(): array * * @param array $data */ - public function setData(array $data): void + public function setData(array $data): self { $this->data = $data; + + return $this; } } diff --git a/src/Frame.php b/src/Frame.php index 4b2c34c0d..fa5b3e169 100644 --- a/src/Frame.php +++ b/src/Frame.php @@ -153,9 +153,11 @@ public function getPreContext(): array * * @param string[] $preContext The source code lines */ - public function setPreContext(array $preContext): void + public function setPreContext(array $preContext): self { $this->preContext = $preContext; + + return $this; } /** @@ -173,9 +175,11 @@ public function getContextLine(): ?string * * @param string|null $contextLine The source code line */ - public function setContextLine(?string $contextLine): void + public function setContextLine(?string $contextLine): self { $this->contextLine = $contextLine; + + return $this; } /** @@ -193,9 +197,11 @@ public function getPostContext(): array * * @param string[] $postContext The source code lines */ - public function setPostContext(array $postContext): void + public function setPostContext(array $postContext): self { $this->postContext = $postContext; + + return $this; } /** @@ -213,9 +219,11 @@ public function isInApp(): bool * * @param bool $inApp flag indicating whether the frame is application-related */ - public function setIsInApp(bool $inApp): void + public function setIsInApp(bool $inApp): self { $this->inApp = $inApp; + + return $this; } /** @@ -235,9 +243,11 @@ public function getVars(): array * * @param array $vars The variables */ - public function setVars(array $vars): void + public function setVars(array $vars): self { $this->vars = $vars; + + return $this; } /** diff --git a/src/Options.php b/src/Options.php index 40e59ec04..e520e1a2f 100644 --- a/src/Options.php +++ b/src/Options.php @@ -81,11 +81,13 @@ public function getPrefixes(): array * * @param string[] $prefixes The prefixes */ - public function setPrefixes(array $prefixes): void + public function setPrefixes(array $prefixes): self { $options = array_merge($this->options, ['prefixes' => $prefixes]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -103,11 +105,13 @@ public function getSampleRate(): float * * @param float $sampleRate The sampling factor */ - public function setSampleRate(float $sampleRate): void + public function setSampleRate(float $sampleRate): self { $options = array_merge($this->options, ['sample_rate' => $sampleRate]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -125,11 +129,13 @@ public function getTracesSampleRate(): ?float * * @param bool|null $enableTracing Boolean if tracing should be enabled or not */ - public function setEnableTracing(?bool $enableTracing): void + public function setEnableTracing(?bool $enableTracing): self { $options = array_merge($this->options, ['enable_tracing' => $enableTracing]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -148,11 +154,13 @@ public function getEnableTracing(): ?bool * * @param ?float $sampleRate The sampling factor */ - public function setTracesSampleRate(?float $sampleRate): void + public function setTracesSampleRate(?float $sampleRate): self { $options = array_merge($this->options, ['traces_sample_rate' => $sampleRate]); $this->options = $this->resolver->resolve($options); + + return $this; } public function getProfilesSampleRate(): ?float @@ -163,11 +171,13 @@ public function getProfilesSampleRate(): ?float return $value ?? null; } - public function setProfilesSampleRate(?float $sampleRate): void + public function setProfilesSampleRate(?float $sampleRate): self { $options = array_merge($this->options, ['profiles_sample_rate' => $sampleRate]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -197,11 +207,13 @@ public function shouldAttachStacktrace(): bool * * @param bool $enable Flag indicating if the stacktrace will be attached to captureMessage calls */ - public function setAttachStacktrace(bool $enable): void + public function setAttachStacktrace(bool $enable): self { $options = array_merge($this->options, ['attach_stacktrace' => $enable]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -217,11 +229,13 @@ public function getContextLines(): ?int * * @param int|null $contextLines The number of lines of code */ - public function setContextLines(?int $contextLines): void + public function setContextLines(?int $contextLines): self { $options = array_merge($this->options, ['context_lines' => $contextLines]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -237,11 +251,13 @@ public function isCompressionEnabled(): bool * * @param bool $enabled Flag indicating whether the request should be compressed */ - public function setEnableCompression(bool $enabled): void + public function setEnableCompression(bool $enabled): self { $options = array_merge($this->options, ['enable_compression' => $enabled]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -257,11 +273,13 @@ public function getEnvironment(): ?string * * @param string|null $environment The environment */ - public function setEnvironment(?string $environment): void + public function setEnvironment(?string $environment): self { $options = array_merge($this->options, ['environment' => $environment]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -279,11 +297,13 @@ public function getInAppExcludedPaths(): array * * @param string[] $paths The list of paths */ - public function setInAppExcludedPaths(array $paths): void + public function setInAppExcludedPaths(array $paths): self { $options = array_merge($this->options, ['in_app_exclude' => $paths]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -301,11 +321,13 @@ public function getInAppIncludedPaths(): array * * @param string[] $paths The list of paths */ - public function setInAppIncludedPaths(array $paths): void + public function setInAppIncludedPaths(array $paths): self { $options = array_merge($this->options, ['in_app_include' => $paths]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -329,13 +351,15 @@ public function getLogger(/* bool $triggerDeprecation = true */): string * * @deprecated since version 3.2, to be removed in 4.0 */ - public function setLogger(string $logger): void + public function setLogger(string $logger): self { @trigger_error(sprintf('Method %s() is deprecated since version 3.2 and will be removed in 4.0.', __METHOD__), \E_USER_DEPRECATED); $options = array_merge($this->options, ['logger' => $logger]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -351,11 +375,13 @@ public function getRelease(): ?string * * @param string|null $release The release */ - public function setRelease(?string $release): void + public function setRelease(?string $release): self { $options = array_merge($this->options, ['release' => $release]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -379,11 +405,13 @@ public function getServerName(): string * * @param string $serverName The server name */ - public function setServerName(string $serverName): void + public function setServerName(string $serverName): self { $options = array_merge($this->options, ['server_name' => $serverName]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -403,11 +431,13 @@ public function getIgnoreExceptions(): array * * @param string[] $ignoreErrors The list of exceptions to be ignored */ - public function setIgnoreExceptions(array $ignoreErrors): void + public function setIgnoreExceptions(array $ignoreErrors): self { $options = array_merge($this->options, ['ignore_exceptions' => $ignoreErrors]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -425,11 +455,13 @@ public function getIgnoreTransactions(): array * * @param string[] $ignoreTransaction The list of transaction names to be ignored */ - public function setIgnoreTransactions(array $ignoreTransaction): void + public function setIgnoreTransactions(array $ignoreTransaction): self { $options = array_merge($this->options, ['ignore_transactions' => $ignoreTransaction]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -451,11 +483,13 @@ public function getBeforeSendCallback(): callable * * @psalm-param callable(Event, ?EventHint): ?Event $callback */ - public function setBeforeSendCallback(callable $callback): void + public function setBeforeSendCallback(callable $callback): self { $options = array_merge($this->options, ['before_send' => $callback]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -477,11 +511,13 @@ public function getBeforeSendTransactionCallback(): callable * * @psalm-param callable(Event, ?EventHint): ?Event $callback */ - public function setBeforeSendTransactionCallback(callable $callback): void + public function setBeforeSendTransactionCallback(callable $callback): self { $options = array_merge($this->options, ['before_send_transaction' => $callback]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -499,11 +535,13 @@ public function getTracePropagationTargets(): ?array * * @param string[] $tracePropagationTargets Trace propagation targets */ - public function setTracePropagationTargets(array $tracePropagationTargets): void + public function setTracePropagationTargets(array $tracePropagationTargets): self { $options = array_merge($this->options, ['trace_propagation_targets' => $tracePropagationTargets]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -521,11 +559,13 @@ public function getTags(): array * * @param array $tags A list of tags */ - public function setTags(array $tags): void + public function setTags(array $tags): self { $options = array_merge($this->options, ['tags' => $tags]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -541,11 +581,13 @@ public function getErrorTypes(): int * * @param int $errorTypes The bit mask */ - public function setErrorTypes(int $errorTypes): void + public function setErrorTypes(int $errorTypes): self { $options = array_merge($this->options, ['error_types' => $errorTypes]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -561,11 +603,13 @@ public function getMaxBreadcrumbs(): int * * @param int $maxBreadcrumbs The maximum number of breadcrumbs */ - public function setMaxBreadcrumbs(int $maxBreadcrumbs): void + public function setMaxBreadcrumbs(int $maxBreadcrumbs): self { $options = array_merge($this->options, ['max_breadcrumbs' => $maxBreadcrumbs]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -589,11 +633,13 @@ public function getBeforeBreadcrumbCallback(): callable * * @psalm-param callable(Breadcrumb): ?Breadcrumb $callback */ - public function setBeforeBreadcrumbCallback(callable $callback): void + public function setBeforeBreadcrumbCallback(callable $callback): self { $options = array_merge($this->options, ['before_breadcrumb' => $callback]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -603,11 +649,13 @@ public function setBeforeBreadcrumbCallback(callable $callback): void * * @param IntegrationInterface[]|callable(IntegrationInterface[]): IntegrationInterface[] $integrations The list or callable */ - public function setIntegrations($integrations): void + public function setIntegrations($integrations): self { $options = array_merge($this->options, ['integrations' => $integrations]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -620,11 +668,13 @@ public function getIntegrations() return $this->options['integrations']; } - public function setTransport(TransportInterface $transport): void + public function setTransport(TransportInterface $transport): self { $options = array_merge($this->options, ['transport' => $transport]); $this->options = $this->resolver->resolve($options); + + return $this; } public function getTransport(): ?TransportInterface @@ -632,11 +682,13 @@ public function getTransport(): ?TransportInterface return $this->options['transport']; } - public function setHttpClient(HttpClientInterface $httpClient): void + public function setHttpClient(HttpClientInterface $httpClient): self { $options = array_merge($this->options, ['http_client' => $httpClient]); $this->options = $this->resolver->resolve($options); + + return $this; } public function getHttpClient(): ?HttpClientInterface @@ -657,11 +709,13 @@ public function shouldSendDefaultPii(): bool * * @param bool $enable Flag indicating if default PII will be sent */ - public function setSendDefaultPii(bool $enable): void + public function setSendDefaultPii(bool $enable): self { $options = array_merge($this->options, ['send_default_pii' => $enable]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -677,11 +731,13 @@ public function hasDefaultIntegrations(): bool * * @param bool $enable Flag indicating whether the default integrations should be enabled */ - public function setDefaultIntegrations(bool $enable): void + public function setDefaultIntegrations(bool $enable): self { $options = array_merge($this->options, ['default_integrations' => $enable]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -697,11 +753,13 @@ public function getMaxValueLength(): int * * @param int $maxValueLength The number of characters after which the values containing text will be truncated */ - public function setMaxValueLength(int $maxValueLength): void + public function setMaxValueLength(int $maxValueLength): self { $options = array_merge($this->options, ['max_value_length' => $maxValueLength]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -717,11 +775,13 @@ public function getHttpProxy(): ?string * * @param string|null $httpProxy The http proxy */ - public function setHttpProxy(?string $httpProxy): void + public function setHttpProxy(?string $httpProxy): self { $options = array_merge($this->options, ['http_proxy' => $httpProxy]); $this->options = $this->resolver->resolve($options); + + return $this; } public function getHttpProxyAuthentication(): ?string @@ -729,11 +789,13 @@ public function getHttpProxyAuthentication(): ?string return $this->options['http_proxy_authentication']; } - public function setHttpProxyAuthentication(?string $httpProxy): void + public function setHttpProxyAuthentication(?string $httpProxy): self { $options = array_merge($this->options, ['http_proxy_authentication' => $httpProxy]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -749,11 +811,13 @@ public function getHttpConnectTimeout(): float * * @param float $httpConnectTimeout The amount of time in seconds */ - public function setHttpConnectTimeout(float $httpConnectTimeout): void + public function setHttpConnectTimeout(float $httpConnectTimeout): self { $options = array_merge($this->options, ['http_connect_timeout' => $httpConnectTimeout]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -771,11 +835,13 @@ public function getHttpTimeout(): float * * @param float $httpTimeout The amount of time in seconds */ - public function setHttpTimeout(float $httpTimeout): void + public function setHttpTimeout(float $httpTimeout): self { $options = array_merge($this->options, ['http_timeout' => $httpTimeout]); $this->options = $this->resolver->resolve($options); + + return $this; } public function getHttpSslVerifyPeer(): bool @@ -783,11 +849,13 @@ public function getHttpSslVerifyPeer(): bool return $this->options['http_ssl_verify_peer']; } - public function setHttpSslVerifyPeer(bool $httpSslVerifyPeer): void + public function setHttpSslVerifyPeer(bool $httpSslVerifyPeer): self { $options = array_merge($this->options, ['http_ssl_verify_peer' => $httpSslVerifyPeer]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -807,11 +875,13 @@ public function shouldCaptureSilencedErrors(): bool * @param bool $shouldCapture If set to true, errors silenced through the @ * operator will be reported, ignored otherwise */ - public function setCaptureSilencedErrors(bool $shouldCapture): void + public function setCaptureSilencedErrors(bool $shouldCapture): self { $options = array_merge($this->options, ['capture_silenced_errors' => $shouldCapture]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -841,11 +911,13 @@ public function getMaxRequestBodySize(): string * request body for as long as sentry can * make sense of it */ - public function setMaxRequestBodySize(string $maxRequestBodySize): void + public function setMaxRequestBodySize(string $maxRequestBodySize): self { $options = array_merge($this->options, ['max_request_body_size' => $maxRequestBodySize]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -866,11 +938,13 @@ public function getClassSerializers(): array * * @param array $serializers The list of serializer callbacks */ - public function setClassSerializers(array $serializers): void + public function setClassSerializers(array $serializers): self { $options = array_merge($this->options, ['class_serializers' => $serializers]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -891,11 +965,13 @@ public function getTracesSampler(): ?callable * * @psalm-param null|callable(\Sentry\Tracing\SamplingContext): float $sampler */ - public function setTracesSampler(?callable $sampler): void + public function setTracesSampler(?callable $sampler): self { $options = array_merge($this->options, ['traces_sampler' => $sampler]); $this->options = $this->resolver->resolve($options); + + return $this; } /** @@ -986,7 +1062,7 @@ private function configureOptions(OptionsResolver $resolver): void $resolver->setAllowedTypes('default_integrations', 'bool'); $resolver->setAllowedTypes('max_value_length', 'int'); $resolver->setAllowedTypes('transport', ['null', TransportInterface::class]); - $resolver->setAllowedTypes('http_client', ['null', HttpCLientInterface::class]); + $resolver->setAllowedTypes('http_client', ['null', HttpClientInterface::class]); $resolver->setAllowedTypes('http_proxy', ['null', 'string']); $resolver->setAllowedTypes('http_proxy_authentication', ['null', 'string']); $resolver->setAllowedTypes('http_connect_timeout', ['int', 'float']); diff --git a/src/Stacktrace.php b/src/Stacktrace.php index 3b532a214..52633602c 100644 --- a/src/Stacktrace.php +++ b/src/Stacktrace.php @@ -69,9 +69,11 @@ public function getFrame(int $index): Frame * * @param Frame $frame The frame */ - public function addFrame(Frame $frame): void + public function addFrame(Frame $frame): self { array_unshift($this->frames, $frame); + + return $this; } /** @@ -81,7 +83,7 @@ public function addFrame(Frame $frame): void * * @throws \OutOfBoundsException If the index is out of range */ - public function removeFrame(int $index): void + public function removeFrame(int $index): self { if (!isset($this->frames[$index])) { throw new \OutOfBoundsException(sprintf('Cannot remove the frame at index %d.', $index)); @@ -92,5 +94,7 @@ public function removeFrame(int $index): void } array_splice($this->frames, $index, 1); + + return $this; } } diff --git a/src/Tracing/DynamicSamplingContext.php b/src/Tracing/DynamicSamplingContext.php index 75c4c9d29..c3a704a53 100644 --- a/src/Tracing/DynamicSamplingContext.php +++ b/src/Tracing/DynamicSamplingContext.php @@ -40,13 +40,15 @@ private function __construct() * @param string $key the list member key * @param string $value the list member value */ - public function set(string $key, string $value): void + public function set(string $key, string $value): self { if ($this->isFrozen) { - return; + return $this; } $this->entries[$key] = $value; + + return $this; } /** @@ -73,9 +75,11 @@ public function get(string $key, ?string $default = null): ?string /** * Mark the dsc as frozen. */ - public function freeze(): void + public function freeze(): self { $this->isFrozen = true; + + return $this; } /** diff --git a/src/Tracing/PropagationContext.php b/src/Tracing/PropagationContext.php index f05f00667..851ecc527 100644 --- a/src/Tracing/PropagationContext.php +++ b/src/Tracing/PropagationContext.php @@ -130,9 +130,11 @@ public function getSpanId(): SpanId return $this->spanId; } - public function setSpanId(SpanId $spanId): void + public function setSpanId(SpanId $spanId): self { $this->spanId = $spanId; + + return $this; } public function getDynamicSamplingContext(): ?DynamicSamplingContext @@ -140,9 +142,11 @@ public function getDynamicSamplingContext(): ?DynamicSamplingContext return $this->dynamicSamplingContext; } - public function setDynamicSamplingContext(DynamicSamplingContext $dynamicSamplingContext): void + public function setDynamicSamplingContext(DynamicSamplingContext $dynamicSamplingContext): self { $this->dynamicSamplingContext = $dynamicSamplingContext; + + return $this; } private static function parseTraceAndBaggage(string $sentryTrace, string $baggage): self diff --git a/src/Tracing/SamplingContext.php b/src/Tracing/SamplingContext.php index f698286a7..bee540bfb 100644 --- a/src/Tracing/SamplingContext.php +++ b/src/Tracing/SamplingContext.php @@ -49,9 +49,11 @@ public function getParentSampled(): ?bool /** * Sets the sampling decision from the parent transaction, if any. */ - public function setParentSampled(?bool $parentSampled): void + public function setParentSampled(?bool $parentSampled): self { $this->parentSampled = $parentSampled; + + return $this; } /** @@ -59,9 +61,11 @@ public function setParentSampled(?bool $parentSampled): void * * @param array|null $additionalContext */ - public function setAdditionalContext(?array $additionalContext): void + public function setAdditionalContext(?array $additionalContext): self { $this->additionalContext = $additionalContext; + + return $this; } /** diff --git a/src/Tracing/Span.php b/src/Tracing/Span.php index ec0a016a8..496efb2d4 100644 --- a/src/Tracing/Span.php +++ b/src/Tracing/Span.php @@ -111,9 +111,11 @@ public function __construct(?SpanContext $context = null) * * @param SpanId $spanId The ID */ - public function setSpanId(SpanId $spanId): void + public function setSpanId(SpanId $spanId): self { $this->spanId = $spanId; + + return $this; } /** @@ -129,9 +131,11 @@ public function getTraceId(): TraceId * * @param TraceId $traceId The ID */ - public function setTraceId(TraceId $traceId): void + public function setTraceId(TraceId $traceId): self { $this->traceId = $traceId; + + return $this; } /** @@ -147,9 +151,11 @@ public function getParentSpanId(): ?SpanId * * @param SpanId|null $parentSpanId The ID */ - public function setParentSpanId(?SpanId $parentSpanId): void + public function setParentSpanId(?SpanId $parentSpanId): self { $this->parentSpanId = $parentSpanId; + + return $this; } /** @@ -165,9 +171,11 @@ public function getStartTimestamp(): float * * @param float $startTimestamp The timestamp */ - public function setStartTimestamp(float $startTimestamp): void + public function setStartTimestamp(float $startTimestamp): self { $this->startTimestamp = $startTimestamp; + + return $this; } /** @@ -193,9 +201,11 @@ public function getDescription(): ?string * * @param string|null $description The description */ - public function setDescription(?string $description): void + public function setDescription(?string $description): self { $this->description = $description; + + return $this; } /** @@ -211,9 +221,11 @@ public function getOp(): ?string * * @param string|null $op The short code */ - public function setOp(?string $op): void + public function setOp(?string $op): self { $this->op = $op; + + return $this; } /** @@ -229,9 +241,11 @@ public function getStatus(): ?SpanStatus * * @param SpanStatus|null $status The status */ - public function setStatus(?SpanStatus $status): void + public function setStatus(?SpanStatus $status): self { $this->status = $status; + + return $this; } /** @@ -239,7 +253,7 @@ public function setStatus(?SpanStatus $status): void * * @param int $statusCode The HTTP status code */ - public function setHttpStatus(int $statusCode): void + public function setHttpStatus(int $statusCode): self { $this->tags['http.status_code'] = (string) $statusCode; @@ -248,6 +262,8 @@ public function setHttpStatus(int $statusCode): void if ($status !== SpanStatus::unknownError()) { $this->status = $status; } + + return $this; } /** @@ -261,13 +277,16 @@ public function getTags(): array } /** - * Sets a map of tags for this event. + * Sets a map of tags for this event. This method will merge the given tags with + * the existing ones. * * @param array $tags The tags */ - public function setTags(array $tags): void + public function setTags(array $tags): self { $this->tags = array_merge($this->tags, $tags); + + return $this; } /** @@ -291,9 +310,11 @@ public function getSampled(): ?bool * * @param bool $sampled Whether to sample or not this span */ - public function setSampled(?bool $sampled): void + public function setSampled(?bool $sampled): self { $this->sampled = $sampled; + + return $this; } /** @@ -312,9 +333,11 @@ public function getData(): array * * @param array $data The data */ - public function setData(array $data): void + public function setData(array $data): self { $this->data = array_merge($this->data, $data); + + return $this; } /** @@ -398,7 +421,7 @@ public function startChild(SpanContext $context): self $span->transaction = $this->transaction; $span->spanRecorder = $this->spanRecorder; - if ($span->spanRecorder != null) { + if ($span->spanRecorder !== null) { $span->spanRecorder->add($span); } @@ -418,9 +441,11 @@ public function getSpanRecorder(): ?SpanRecorder /** * Detaches the span recorder from this instance. */ - public function detachSpanRecorder(): void + public function detachSpanRecorder(): self { $this->spanRecorder = null; + + return $this; } /** diff --git a/src/Tracing/SpanContext.php b/src/Tracing/SpanContext.php index 59e80745b..a1afa3f77 100644 --- a/src/Tracing/SpanContext.php +++ b/src/Tracing/SpanContext.php @@ -66,9 +66,11 @@ public function getDescription(): ?string return $this->description; } - public function setDescription(?string $description): void + public function setDescription(?string $description): self { $this->description = $description; + + return $this; } public function getOp(): ?string @@ -76,9 +78,11 @@ public function getOp(): ?string return $this->op; } - public function setOp(?string $op): void + public function setOp(?string $op): self { $this->op = $op; + + return $this; } public function getStatus(): ?SpanStatus @@ -86,9 +90,11 @@ public function getStatus(): ?SpanStatus return $this->status; } - public function setStatus(?SpanStatus $status): void + public function setStatus(?SpanStatus $status): self { $this->status = $status; + + return $this; } public function getParentSpanId(): ?SpanId @@ -96,9 +102,11 @@ public function getParentSpanId(): ?SpanId return $this->parentSpanId; } - public function setParentSpanId(?SpanId $parentSpanId): void + public function setParentSpanId(?SpanId $parentSpanId): self { $this->parentSpanId = $parentSpanId; + + return $this; } public function getSampled(): ?bool @@ -106,9 +114,11 @@ public function getSampled(): ?bool return $this->sampled; } - public function setSampled(?bool $sampled): void + public function setSampled(?bool $sampled): self { $this->sampled = $sampled; + + return $this; } public function getSpanId(): ?SpanId @@ -116,9 +126,11 @@ public function getSpanId(): ?SpanId return $this->spanId; } - public function setSpanId(?SpanId $spanId): void + public function setSpanId(?SpanId $spanId): self { $this->spanId = $spanId; + + return $this; } public function getTraceId(): ?TraceId @@ -126,9 +138,11 @@ public function getTraceId(): ?TraceId return $this->traceId; } - public function setTraceId(?TraceId $traceId): void + public function setTraceId(?TraceId $traceId): self { $this->traceId = $traceId; + + return $this; } /** @@ -142,9 +156,11 @@ public function getTags(): array /** * @param array $tags */ - public function setTags(array $tags): void + public function setTags(array $tags): self { $this->tags = $tags; + + return $this; } /** @@ -158,9 +174,11 @@ public function getData(): array /** * @param array $data */ - public function setData(array $data): void + public function setData(array $data): self { $this->data = $data; + + return $this; } public function getStartTimestamp(): ?float @@ -168,9 +186,11 @@ public function getStartTimestamp(): ?float return $this->startTimestamp; } - public function setStartTimestamp(?float $startTimestamp): void + public function setStartTimestamp(?float $startTimestamp): self { $this->startTimestamp = $startTimestamp; + + return $this; } public function getEndTimestamp(): ?float @@ -178,8 +198,10 @@ public function getEndTimestamp(): ?float return $this->endTimestamp; } - public function setEndTimestamp(?float $endTimestamp): void + public function setEndTimestamp(?float $endTimestamp): self { $this->endTimestamp = $endTimestamp; + + return $this; } } diff --git a/src/Tracing/SpanRecorder.php b/src/Tracing/SpanRecorder.php index 560763044..7f9f70b88 100644 --- a/src/Tracing/SpanRecorder.php +++ b/src/Tracing/SpanRecorder.php @@ -31,13 +31,15 @@ public function __construct(int $maxSpans = 1000) * Adds a span to the list of recorded spans or detaches the recorder if the * maximum number of spans to store has been reached. */ - public function add(Span $span): void + public function add(Span $span): self { if (\count($this->spans) > $this->maxSpans) { $span->detachSpanRecorder(); } else { $this->spans[] = $span; } + + return $this; } /** diff --git a/src/Tracing/Transaction.php b/src/Tracing/Transaction.php index 4df809015..4c832d369 100644 --- a/src/Tracing/Transaction.php +++ b/src/Tracing/Transaction.php @@ -104,21 +104,18 @@ public function getDynamicSamplingContext(): DynamicSamplingContext * * @param int $maxSpans The maximum number of spans that can be recorded */ - public function initSpanRecorder(int $maxSpans = 1000): void + public function initSpanRecorder(int $maxSpans = 1000): self { if ($this->spanRecorder === null) { $this->spanRecorder = new SpanRecorder($maxSpans); } $this->spanRecorder->add($this); - } - public function detachSpanRecorder(): void - { - $this->spanRecorder = null; + return $this; } - public function initProfiler(): void + public function initProfiler(): self { if ($this->profiler === null) { $client = $this->hub->getClient(); @@ -126,6 +123,8 @@ public function initProfiler(): void $this->profiler = new Profiler($options); } + + return $this; } public function getProfiler(): ?Profiler @@ -133,9 +132,11 @@ public function getProfiler(): ?Profiler return $this->profiler; } - public function detachProfiler(): void + public function detachProfiler(): self { $this->profiler = null; + + return $this; } /** diff --git a/src/Tracing/TransactionContext.php b/src/Tracing/TransactionContext.php index 4f28037fb..e452de72a 100644 --- a/src/Tracing/TransactionContext.php +++ b/src/Tracing/TransactionContext.php @@ -55,9 +55,11 @@ public function getName(): string * * @param string $name The name */ - public function setName(string $name): void + public function setName(string $name): self { $this->name = $name; + + return $this; } /** @@ -73,9 +75,11 @@ public function getParentSampled(): ?bool * * @param bool|null $parentSampled The decision */ - public function setParentSampled(?bool $parentSampled): void + public function setParentSampled(?bool $parentSampled): self { $this->parentSampled = $parentSampled; + + return $this; } /** @@ -91,9 +95,11 @@ public function getMetadata(): TransactionMetadata * * @param TransactionMetadata $metadata The transaction metadata */ - public function setMetadata(TransactionMetadata $metadata): void + public function setMetadata(TransactionMetadata $metadata): self { $this->metadata = $metadata; + + return $this; } /** @@ -101,9 +107,11 @@ public function setMetadata(TransactionMetadata $metadata): void * * @param TransactionSource $transactionSource The transaction source */ - public function setSource(TransactionSource $transactionSource): void + public function setSource(TransactionSource $transactionSource): self { $this->metadata->setSource($transactionSource); + + return $this; } /** diff --git a/src/Tracing/TransactionMetadata.php b/src/Tracing/TransactionMetadata.php index a217fc831..2a10923bc 100644 --- a/src/Tracing/TransactionMetadata.php +++ b/src/Tracing/TransactionMetadata.php @@ -49,9 +49,11 @@ public function getSamplingRate() /** * @param float|int|null $samplingRate */ - public function setSamplingRate($samplingRate): void + public function setSamplingRate($samplingRate): self { $this->samplingRate = $samplingRate; + + return $this; } public function getDynamicSamplingContext(): ?DynamicSamplingContext @@ -59,9 +61,11 @@ public function getDynamicSamplingContext(): ?DynamicSamplingContext return $this->dynamicSamplingContext; } - public function setDynamicSamplingContext(?DynamicSamplingContext $dynamicSamplingContext): void + public function setDynamicSamplingContext(?DynamicSamplingContext $dynamicSamplingContext): self { $this->dynamicSamplingContext = $dynamicSamplingContext; + + return $this; } public function getSource(): ?TransactionSource @@ -69,8 +73,10 @@ public function getSource(): ?TransactionSource return $this->source; } - public function setSource(?TransactionSource $source): void + public function setSource(?TransactionSource $source): self { $this->source = $source; + + return $this; } } diff --git a/src/UserDataBag.php b/src/UserDataBag.php index 6e7444be4..5e08dbb5b 100644 --- a/src/UserDataBag.php +++ b/src/UserDataBag.php @@ -130,13 +130,15 @@ public function getId() * * @param string|int|null $id The ID */ - public function setId($id): void + public function setId($id): self { if ($id !== null && !\is_string($id) && !\is_int($id)) { throw new \UnexpectedValueException(sprintf('Expected an integer or string value for the $id argument. Got: "%s".', get_debug_type($id))); } $this->id = $id; + + return $this; } /** @@ -152,9 +154,11 @@ public function getUsername(): ?string * * @param string|null $username The username */ - public function setUsername(?string $username): void + public function setUsername(?string $username): self { $this->username = $username; + + return $this; } /** @@ -170,9 +174,11 @@ public function getEmail(): ?string * * @param string|null $email The email */ - public function setEmail(?string $email): void + public function setEmail(?string $email): self { $this->email = $email; + + return $this; } /** @@ -188,9 +194,11 @@ public function getSegment(): ?string * * @param string|null $segment The segment */ - public function setSegment(?string $segment): void + public function setSegment(?string $segment): self { $this->segment = $segment; + + return $this; } /** @@ -206,13 +214,15 @@ public function getIpAddress(): ?string * * @param string|null $ipAddress The ip address */ - public function setIpAddress(?string $ipAddress): void + public function setIpAddress(?string $ipAddress): self { if ($ipAddress !== null && filter_var($ipAddress, \FILTER_VALIDATE_IP) === false) { throw new \InvalidArgumentException(sprintf('The "%s" value is not a valid IP address.', $ipAddress)); } $this->ipAddress = $ipAddress; + + return $this; } /** @@ -231,9 +241,11 @@ public function getMetadata(): array * @param string $name The name of the field * @param mixed $value The value */ - public function setMetadata(string $name, $value): void + public function setMetadata(string $name, $value): self { $this->metadata[$name] = $value; + + return $this; } /** @@ -241,9 +253,11 @@ public function setMetadata(string $name, $value): void * * @param string $name The name of the field */ - public function removeMetadata(string $name): void + public function removeMetadata(string $name): self { unset($this->metadata[$name]); + + return $this; } /** diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php index f343f941e..53218169d 100644 --- a/tests/FunctionsTest.php +++ b/tests/FunctionsTest.php @@ -343,9 +343,9 @@ public function testTraceparentWithTracingEnabled(): void SentrySdk::setCurrentHub($hub); - $spanContext = new SpanContext(); - $spanContext->setTraceId(new TraceId('566e3688a61d4bc888951642d6f14a19')); - $spanContext->setSpanId(new SpanId('566e3688a61d4bc8')); + $spanContext = (new SpanContext()) + ->setTraceId(new TraceId('566e3688a61d4bc888951642d6f14a19')) + ->setSpanId(new SpanId('566e3688a61d4bc8')); $span = new Span($spanContext); diff --git a/tests/Tracing/SpanTest.php b/tests/Tracing/SpanTest.php index 8244f18db..9c2387415 100644 --- a/tests/Tracing/SpanTest.php +++ b/tests/Tracing/SpanTest.php @@ -51,15 +51,15 @@ public function testStartChild(): void $spanContext2ParentSpanId = SpanId::generate(); $spanContext2TraceId = TraceId::generate(); - $spanContext1 = new SpanContext(); - $spanContext1->setSampled(false); - $spanContext1->setSpanId(SpanId::generate()); - $spanContext1->setTraceId(TraceId::generate()); - - $spanContext2 = new SpanContext(); - $spanContext2->setSampled(true); - $spanContext2->setParentSpanId($spanContext2ParentSpanId); - $spanContext2->setTraceId($spanContext2TraceId); + $spanContext1 = (new SpanContext()) + ->setSampled(false) + ->setSpanId(SpanId::generate()) + ->setTraceId(TraceId::generate()); + + $spanContext2 = (new SpanContext()) + ->setSampled(true) + ->setParentSpanId($spanContext2ParentSpanId) + ->setTraceId($spanContext2TraceId); $span1 = new Span($spanContext1); $span2 = $span1->startChild($spanContext2); diff --git a/tests/Tracing/TransactionTest.php b/tests/Tracing/TransactionTest.php index d66f198d7..34cfe2b0e 100644 --- a/tests/Tracing/TransactionTest.php +++ b/tests/Tracing/TransactionTest.php @@ -28,10 +28,10 @@ public function testFinish(): void ClockMock::withClockMock(1600640877); $expectedEventId = null; - $transactionContext = new TransactionContext(); - $transactionContext->setTags(['ios_version' => '4.0']); - $transactionContext->setSampled(true); - $transactionContext->setStartTimestamp(1600640865); + $transactionContext = (new TransactionContext()) + ->setTags(['ios_version' => '4.0']) + ->setSampled(true) + ->setStartTimestamp(1600640865); $client = $this->createMock(ClientInterface::class); $client->expects($this->once())