From 35c6f62b21be5df0f4adcab396aace2f71fa1ccf Mon Sep 17 00:00:00 2001 From: Chris Geiger Date: Fri, 27 Sep 2024 11:17:34 -0700 Subject: [PATCH 1/3] fix for invalid open-telemetry releases --- app/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/composer.json b/app/composer.json index f7710d0..a4941ac 100644 --- a/app/composer.json +++ b/app/composer.json @@ -5,8 +5,8 @@ "temporal/sdk": "^2.8.0", "spiral/tokenizer": "^3.7", "temporal/open-telemetry-interceptors": "dev-master", - "open-telemetry/exporter-otlp": "^0.0.17", - "open-telemetry/transport-grpc": "^0.0.17", + "open-telemetry/exporter-otlp": "^1.0", + "open-telemetry/transport-grpc": "^1.0", "symfony/console": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { From d6cb9db30d94e42588afacd274effad24acba3a6 Mon Sep 17 00:00:00 2001 From: Chris Geiger Date: Fri, 27 Sep 2024 11:23:46 -0700 Subject: [PATCH 2/3] update renamed Signals class --- app/util-src/TracerFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/util-src/TracerFactory.php b/app/util-src/TracerFactory.php index 0521e5f..05b52b1 100644 --- a/app/util-src/TracerFactory.php +++ b/app/util-src/TracerFactory.php @@ -11,7 +11,7 @@ namespace Temporal\SampleUtils; -use OpenTelemetry\API\Common\Signal\Signals; +use OpenTelemetry\API\Signals; use OpenTelemetry\API\Trace\Propagation\TraceContextPropagator; use OpenTelemetry\Contrib\Grpc\GrpcTransportFactory; use OpenTelemetry\Contrib\Otlp\OtlpUtil; From 3ec6b338bcd063ec3cc9c6e5ebb5a998f759f011 Mon Sep 17 00:00:00 2001 From: Chris Geiger Date: Fri, 27 Sep 2024 11:40:27 -0700 Subject: [PATCH 3/3] fix for merge functions that don't exist in OpenTelemetry SDK --- app/util-src/TracerFactory.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/util-src/TracerFactory.php b/app/util-src/TracerFactory.php index 05b52b1..69ec5a8 100644 --- a/app/util-src/TracerFactory.php +++ b/app/util-src/TracerFactory.php @@ -36,12 +36,15 @@ public static function create(string $serviceName): Tracer $transport = (new GrpcTransportFactory())->create($endpoint . OtlpUtil::method(Signals::TRACE)); $spanProcessor = (new SpanProcessorFactory())->create(new SpanExporter($transport)); - $resource = ResourceInfoFactory::merge( - ResourceInfo::create(Attributes::create([ - ResourceAttributes::SERVICE_NAME => $serviceName, - ])), - ResourceInfoFactory::defaultResource(), - ); + $defaultResource = ResourceInfoFactory::defaultResource(); + $defaultAttributes = $defaultResource->getAttributes()->toArray(); + + $customAttributes = [ + ResourceAttributes::SERVICE_NAME => $serviceName, + ]; + + $mergedAttributes = array_merge($defaultAttributes, $customAttributes); + $resource = ResourceInfo::create(Attributes::create($mergedAttributes)); return new Tracer( (new TracerProvider(spanProcessors: $spanProcessor, resource: $resource))->getTracer('Temporal Samples'),