removing jaeger exporters

.gitsplit.yml

@@ -8,8 +8,6 @@ project_url: "https://github.com/open-telemetry/opentelemetry-php.git"
 splits:
   - prefix: "proto/otel"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/gen-otlp-protobuf.git"
-  - prefix: "thrift/jaeger"
-    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/gen-jaeger-thrift.git"
   - prefix: "src/Context"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/context.git"
   - prefix: "src/SemConv"
@@ -20,8 +18,6 @@ splits:
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/sdk.git"
   - prefix: "src/Contrib"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/sdk-contrib.git"
-  - prefix: "src/Contrib/Jaeger"
-    target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-jaeger.git"
   - prefix: "src/Contrib/Newrelic"
     target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-newrelic.git"
   - prefix: "src/Contrib/Otlp"

.phan/config.php

@@ -319,7 +319,6 @@
     'exclude_analysis_directory_list' => [
         'vendor/',
         'proto/',
-        'thrift/',
     ],
 
     // Enable this to enable checks of require/include statements referring to valid paths.
@@ -370,8 +369,6 @@
         'src',
         'proto/otel/GPBMetadata',
         'proto/otel/Opentelemetry',
-        'thrift',
-        'vendor/packaged/thrift',
         'vendor/composer',
         'vendor/grpc/grpc/src/lib',
         'vendor/guzzlehttp',

Makefile

@@ -59,7 +59,6 @@ smoke-test-exporter-examples: FORCE ## Run (some) exporter smoke test examples
 # Note this does not include every exporter at the moment
 	$(DOCKER_COMPOSE) up -d --remove-orphans
 	$(DC_RUN_PHP) php ./examples/traces/features/exporters/zipkin.php
-	$(DC_RUN_PHP) php ./examples/traces/features/exporters/jaeger.php
 	$(DC_RUN_PHP) php ./examples/traces/features/parent_span_example.php
 # The following examples do not use the DC_RUN_PHP global because they need environment variables.
 	$(DOCKER_COMPOSE) run -e NEW_RELIC_ENDPOINT -e NEW_RELIC_INSERT_KEY --rm php php ./examples/traces/features/exporters/newrelic.php
@@ -87,8 +86,6 @@ fiber-ffi-example:
 	@$(DOCKER_COMPOSE) -f docker-compose.fiber-ffi.yaml -p opentelemetry-php_fiber-ffi-example up -d web
 protobuf: ## Generate protobuf files
 	./script/proto_gen.sh
-thrift: ## Generate thrift files
-	./script/thrift_gen.sh
 bash: ## bash shell into container
 	$(DC_RUN_PHP) bash
 style: ## Run style check/fix

README.md

@@ -59,8 +59,6 @@ The [open-telemetry/opentelemetry](https://packagist.org/packages/open-telemetry
 This repository also hosts and distributes generated client code used by individual components as separate packages.  These packages are:
 - Generated [OTLP](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/otlp.md) ProtoBuf files:
   [open-telemetry/gen-otlp-protobuf](https://packagist.org/packages/open-telemetry/gen-otlp-protobuf)
-- Generated [Jaeger](https://github.com/jaegertracing/jaeger-idl) Thrift files:
-  [open-telemetry/gen-jaeger-thrift](https://packagist.org/packages/open-telemetry/gen-jaeger-thrift)
 
 For now the generated code packages are meant to be only used by library components internally.
 
@@ -308,7 +306,7 @@ See [examples/traces/demo](examples/traces/demo) for a working example.
 
 ### Trace examples
 
-You can use the [zipkin](/examples/traces/exporters/zipkin.php) or [jaeger](/examples/traces/exporters/jaeger.php) example to test out the reference
+You can use the [zipkin](/examples/traces/exporters/zipkin.php) example to test out the reference
 implementations. This example performs a sample trace with a grouping of 5 spans and exports the result
 to a local zipkin or jaeger instance.
 

composer.json

@@ -12,7 +12,6 @@
         "cloudevents/sdk-php": "^v1.0.1",
         "google/protobuf": "^3.3.0",
         "grpc/grpc": "^1.30",
-        "packaged/thrift": "^0.15.0",
         "php-http/async-client-implementation": "^1.0",
         "php-http/discovery": "^1.14",
         "promphp/prometheus_client_php": "^2.2.1",
@@ -47,7 +46,6 @@
     "replace": {
         "open-telemetry/api": "self.version",
         "open-telemetry/context": "self.version",
-        "open-telemetry/gen-jaeger-thrift": "self.version",
         "open-telemetry/gen-otlp-protobuf": "self.version",
         "open-telemetry/sdk": "self.version",
         "open-telemetry/sdk-contrib": "self.version",
@@ -57,8 +55,7 @@
         "psr-4": {
             "OpenTelemetry\\": "src/",
             "Opentelemetry\\Proto\\": "proto/otel/Opentelemetry/Proto/",
-            "GPBMetadata\\Opentelemetry\\": "proto/otel/GPBMetadata/Opentelemetry/",
-            "Jaeger\\Thrift\\": "thrift/jaeger/"
+            "GPBMetadata\\Opentelemetry\\": "proto/otel/GPBMetadata/Opentelemetry/"
         },
         "files": [
             "src/Context/fiber/initialize_fiber_handler.php",
@@ -112,7 +109,6 @@
     "suggest": {
         "ext-gmp": "To support unlimited number of synchronous metric readers",
         "ext-grpc": "To use the OTLP GRPC Exporter",
-        "ext-protobuf": "For more performant protobuf/grpc exporting",
-        "ext-sockets": "To use the Thrift UDP Exporter for the Jaeger Agent"
+        "ext-protobuf": "For more performant protobuf/grpc exporting"
     }
 }

deptrac.yaml

@@ -13,7 +13,6 @@ deptrac:
     paths:
         - ./src
         - ./proto
-        - ./thrift
         - ./tests
     exclude_files:
         - '#.*test.*#'
@@ -80,14 +79,6 @@ deptrac:
           collectors:
               - type: className
                 regex: ^Composer\\*
-      -   name: Thrift
-          collectors:
-              - type: className
-                regex: ^Thrift\\*
-      -   name: JaegerThrift
-          collectors:
-              - type: className
-                regex: ^Jaeger\\Thrift\\*
 
     ruleset:
       Context:
@@ -107,12 +98,8 @@ deptrac:
           - +OtelProto
           - Grpc
           - Prometheus
-          - Thrift
-          - JaegerThrift
       Extension:
           - +API
       OtelProto:
           - GoogleProtobuf
           - Grpc
-      JaegerThrift:
-          - Thrift

examples/traces/exporters/zipkin.php

@@ -10,7 +10,6 @@
 
 $transport = PsrTransportFactory::discover()->create('http://zipkin:9411/api/v2/spans', 'application/json');
 $zipkinExporter = new ZipkinExporter(
-    'alwaysOnZipkinExample',
     $transport
 );
 $tracerProvider =  new TracerProvider(

examples/traces/features/parent_span_example.php

@@ -3,11 +3,9 @@
 declare(strict_types=1);
 require __DIR__ . '/../../../vendor/autoload.php';
 
-use OpenTelemetry\Contrib\Jaeger\Exporter as JaegerExporter;
 use OpenTelemetry\Contrib\Zipkin\Exporter as ZipkinExporter;
 use OpenTelemetry\SDK\Common\Export\Http\PsrTransportFactory;
 use OpenTelemetry\SDK\Trace\Sampler\AlwaysOnSampler;
-use OpenTelemetry\SDK\Trace\Span;
 use OpenTelemetry\SDK\Trace\SpanProcessor\SimpleSpanProcessor;
 use OpenTelemetry\SDK\Trace\TracerProvider;
 
@@ -20,16 +18,9 @@
     PsrTransportFactory::discover()->create('http://zipkin:9411/api/v2/spans')
 );
 
-// jaeger exporter
-$jaegerExporter = new JaegerExporter(
-    $serviceName,
-    PsrTransportFactory::discover()->create('http://jaeger:9411/api/v2/spans')
-);
-
 $tracerProvider =  new TracerProvider(
     [
         new SimpleSpanProcessor($zipkinExporter),
-        new SimpleSpanProcessor($jaegerExporter),
     ],
     $sampler
 );
@@ -74,7 +65,6 @@
 echo '  - ' . $secondRootSpan->getContext()->getTraceId() . PHP_EOL;
 echo PHP_EOL;
 echo 'See the results at' . PHP_EOL;
-echo 'Jaeger: http://localhost:16686/' . PHP_EOL;
 echo 'Zipkin: http://localhost:9411/' . PHP_EOL;
 
 $tracerProvider->shutdown();

examples/traces/troubleshooting/logging_of_span_data.php

@@ -14,7 +14,7 @@
  * will be the last log entry
  */
 
-use OpenTelemetry\Contrib\Jaeger\Exporter as JaegerExporter;
+use OpenTelemetry\Contrib\Zipkin\Exporter as ZipkinExporter;
 use OpenTelemetry\SDK\Common\Export\Http\PsrTransportFactory;
 use OpenTelemetry\SDK\Common\Time\ClockFactory;
 use OpenTelemetry\SDK\Logs\SimplePsrFileLogger;
@@ -35,14 +35,13 @@
 /**
  * Create the Exporter.
  */
-$exporterEndpoint = 'http://jaeger:9412/api/v2/spans';
+$exporterEndpoint = 'http://zipkin:9411/api/v2/spans';
 /**
  * If you want to simulate a connection error, uncomment the next line
  */
-//$exporterEndpoint = 'http://example.com:9412/api/v2/spans';
-$exporter = new JaegerExporter(
-    'alwaysOnJaegerExample',
-    PsrTransportFactory::discover()->create('http://jaeger:9412/api/v2/spans', 'application/json'),
+//$exporterEndpoint = 'http://example.com:9411/api/v2/spans';
+$exporter = new ZipkinExporter(
+    PsrTransportFactory::discover()->create($exporterEndpoint, 'application/json'),
 );
 /**
  * Decorate the Exporter

phpmetrics.json

@@ -4,8 +4,7 @@
     ],
     "exclude": [
         "tests",
-        "proto",
-        "thrift"
+        "proto"
     ],
     "report": {
         "html": "var/metrics",