From 0fd70be0933e62e0a30f39635caaa258e20aecb1 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Tue, 23 Aug 2022 09:43:02 +1000 Subject: [PATCH 1/7] gitsplit exporters --- .gitsplit.yml | 14 ++++++++++ proto/otel/README.md | 1 + src/API/README.md | 1 + src/Context/README.md | 1 + src/Contrib/Jaeger/README.md | 11 ++++++++ src/Contrib/Jaeger/composer.json | 29 ++++++++++++++++++++ src/Contrib/Newrelic/README.md | 7 +++++ src/Contrib/Newrelic/composer.json | 26 ++++++++++++++++++ src/Contrib/Otlp/README.md | 3 ++ src/Contrib/Otlp/composer.json | 24 ++++++++++++++++ src/Contrib/OtlpGrpc/README.md | 7 +++++ src/Contrib/OtlpGrpc/composer.json | 29 ++++++++++++++++++++ src/Contrib/OtlpHttp/README.md | 7 +++++ src/Contrib/OtlpHttp/composer.json | 32 ++++++++++++++++++++++ src/Contrib/README.md | 1 + src/Contrib/Zipkin/README.md | 7 +++++ src/Contrib/Zipkin/composer.json | 26 ++++++++++++++++++ src/Contrib/ZipkinToNewrelic/README.md | 7 +++++ src/Contrib/ZipkinToNewrelic/composer.json | 26 ++++++++++++++++++ src/SDK/README.md | 1 + src/SemConv/README.md | 1 + thrift/jaeger/README.md | 1 + 22 files changed, 262 insertions(+) create mode 100644 proto/otel/README.md create mode 100644 src/API/README.md create mode 100644 src/Context/README.md create mode 100644 src/Contrib/Jaeger/README.md create mode 100644 src/Contrib/Jaeger/composer.json create mode 100644 src/Contrib/Newrelic/README.md create mode 100644 src/Contrib/Newrelic/composer.json create mode 100644 src/Contrib/Otlp/README.md create mode 100644 src/Contrib/Otlp/composer.json create mode 100644 src/Contrib/OtlpGrpc/README.md create mode 100644 src/Contrib/OtlpGrpc/composer.json create mode 100644 src/Contrib/OtlpHttp/README.md create mode 100644 src/Contrib/OtlpHttp/composer.json create mode 100644 src/Contrib/README.md create mode 100644 src/Contrib/Zipkin/README.md create mode 100644 src/Contrib/Zipkin/composer.json create mode 100644 src/Contrib/ZipkinToNewrelic/README.md create mode 100644 src/Contrib/ZipkinToNewrelic/composer.json create mode 100644 src/SDK/README.md create mode 100644 src/SemConv/README.md create mode 100644 thrift/jaeger/README.md diff --git a/.gitsplit.yml b/.gitsplit.yml index 0b732aada..f9c92e0d3 100644 --- a/.gitsplit.yml +++ b/.gitsplit.yml @@ -20,6 +20,20 @@ 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" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-otlp-common.git" + - prefix: "src/Contrib/OtlpGrpc" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-otlp-grpc.git" + - prefix: "src/Contrib/OtlpHttp" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-otlp-http.git" + - prefix: "src/Contrib/Zipkin" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-zipkin.git" + - prefix: "src/Contrib/ZipkinToNewrelic" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-zipkintonewrelic.git" # List of references to split (defined as regexp) origins: diff --git a/proto/otel/README.md b/proto/otel/README.md new file mode 100644 index 000000000..c1317356d --- /dev/null +++ b/proto/otel/README.md @@ -0,0 +1 @@ +# OpenTelemetry protobuf files diff --git a/src/API/README.md b/src/API/README.md new file mode 100644 index 000000000..1eaec504d --- /dev/null +++ b/src/API/README.md @@ -0,0 +1 @@ +# OpenTelemetry API diff --git a/src/Context/README.md b/src/Context/README.md new file mode 100644 index 000000000..05074a542 --- /dev/null +++ b/src/Context/README.md @@ -0,0 +1 @@ +# OpenTelemetry Context diff --git a/src/Contrib/Jaeger/README.md b/src/Contrib/Jaeger/README.md new file mode 100644 index 000000000..9de46a902 --- /dev/null +++ b/src/Contrib/Jaeger/README.md @@ -0,0 +1,11 @@ +# OpenTelemetry Jaeger Exporter + +A Jaeger exporter for OpenTelemetry. + +## Usage + +### HTTP (Zipkin) +https://github.com/open-telemetry/opentelemetry-php/blob/main/examples/traces/features/exporters/jaeger.php + +### Thrift +https://github.com/open-telemetry/opentelemetry-php/blob/main/examples/traces/features/exporters/jaeger_thrift.php \ No newline at end of file diff --git a/src/Contrib/Jaeger/composer.json b/src/Contrib/Jaeger/composer.json new file mode 100644 index 000000000..579f880d6 --- /dev/null +++ b/src/Contrib/Jaeger/composer.json @@ -0,0 +1,29 @@ +{ + "name": "open-telemetry/exporter-jaeger", + "description": "jaeger exporter for OpenTelemetry PHP.", + "keywords": ["opentelemetry", "otel", "tracing", "logging", "apm", "jaeger"], + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "require": { + "php": "^7.4 || ^8.0", + "open-telemetry/api": "self.version", + "open-telemetry/sdk": "self.version", + "php-http/async-client-implementation": "^1.0", + "php-http/discovery": "^1.14", + "psr/http-factory-implementation": "^1.0" + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\Contrib\\Jaeger\\": "." + } + }, + "suggest": { + "ext-sockets": "To use the Thrift UDP Exporter" + } +} diff --git a/src/Contrib/Newrelic/README.md b/src/Contrib/Newrelic/README.md new file mode 100644 index 000000000..3d9c05b63 --- /dev/null +++ b/src/Contrib/Newrelic/README.md @@ -0,0 +1,7 @@ +# OpenTelemetry New Relic Exporter + +A New Relic exporter for OpenTelemetry. + +## Usage + +See https://github.com/open-telemetry/opentelemetry-php/blob/main/examples/traces/features/exporters/newrelic.php diff --git a/src/Contrib/Newrelic/composer.json b/src/Contrib/Newrelic/composer.json new file mode 100644 index 000000000..a015699af --- /dev/null +++ b/src/Contrib/Newrelic/composer.json @@ -0,0 +1,26 @@ +{ + "name": "open-telemetry/exporter-newrelic", + "description": "New Relic exporter for OpenTelemetry PHP.", + "keywords": ["opentelemetry", "otel", "tracing", "exporter", "newrelic"], + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "require": { + "php": "^7.4 || ^8.0", + "open-telemetry/api": "self.version", + "open-telemetry/sdk": "self.version", + "php-http/async-client-implementation": "^1.0", + "php-http/discovery": "^1.14", + "psr/http-factory-implementation": "^1.0" + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\Contrib\\Newrelic\\": "." + } + } +} diff --git a/src/Contrib/Otlp/README.md b/src/Contrib/Otlp/README.md new file mode 100644 index 000000000..a012e8ec1 --- /dev/null +++ b/src/Contrib/Otlp/README.md @@ -0,0 +1,3 @@ +# OpenTelemetry OTLP common exporter + +Common funtionality used by both OTLP GRPC and HTTP exporters. diff --git a/src/Contrib/Otlp/composer.json b/src/Contrib/Otlp/composer.json new file mode 100644 index 000000000..d5f6cd6cc --- /dev/null +++ b/src/Contrib/Otlp/composer.json @@ -0,0 +1,24 @@ +{ + "name": "open-telemetry/exporter-otlp-common", + "description": "OTLP common code for OpenTelemetry exporters.", + "keywords": ["opentelemetry", "otel", "tracing", "exporter", "otlp", "grpc"], + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "require": { + "php": "^7.4 || ^8.0", + "open-telemetry/gen-otlp-protobuf": "self.version", + "open-telemetry/api": "self.version", + "open-telemetry/sdk": "self.version" + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\Contrib\\Otlp\\": "." + } + } +} diff --git a/src/Contrib/OtlpGrpc/README.md b/src/Contrib/OtlpGrpc/README.md new file mode 100644 index 000000000..b37cf10e3 --- /dev/null +++ b/src/Contrib/OtlpGrpc/README.md @@ -0,0 +1,7 @@ +# OpenTelemetry GRPC Exporter + +OTLP GRPC exporter for OpenTelemetry. + +## Usage + +See https://github.com/open-telemetry/opentelemetry-php/blob/main/examples/traces/features/exporters/otlp_grpc.php diff --git a/src/Contrib/OtlpGrpc/composer.json b/src/Contrib/OtlpGrpc/composer.json new file mode 100644 index 000000000..dc019a111 --- /dev/null +++ b/src/Contrib/OtlpGrpc/composer.json @@ -0,0 +1,29 @@ +{ + "name": "open-telemetry/exporter-otlp-grpc", + "description": "GRPC exporter for OpenTelemetry PHP.", + "keywords": ["opentelemetry", "otel", "tracing", "apm", "otlp", "grpc", "protobuf"], + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "require": { + "php": "^7.4 || ^8.0", + "ext-grpc": "*", + "google/protobuf": "^3.3.0", + "open-telemetry/exporter-otlp-common": "self.version", + "open-telemetry/gen-otlp-protobuf": "self.version", + "open-telemetry/sdk": "self.version" + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\Contrib\\OtlpGrpc\\": "." + } + }, + "suggest": { + "ext-protobuf": "For more performant grpc exporting" + } +} diff --git a/src/Contrib/OtlpHttp/README.md b/src/Contrib/OtlpHttp/README.md new file mode 100644 index 000000000..e85029ebc --- /dev/null +++ b/src/Contrib/OtlpHttp/README.md @@ -0,0 +1,7 @@ +# OpenTelemetry HTTP Exporter + +OTLP HTTP exporter for OpenTelemetry. + +## Usage + +See https://github.com/open-telemetry/opentelemetry-php/blob/main/examples/traces/features/exporters/otlp.php diff --git a/src/Contrib/OtlpHttp/composer.json b/src/Contrib/OtlpHttp/composer.json new file mode 100644 index 000000000..b276a4866 --- /dev/null +++ b/src/Contrib/OtlpHttp/composer.json @@ -0,0 +1,32 @@ +{ + "name": "open-telemetry/exporter-otlp-http", + "description": "HTTP/protobuf exporter for OpenTelemetry PHP.", + "keywords": ["opentelemetry", "otel", "tracing", "otlp", "protobuf"], + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "require": { + "php": "^7.4 || ^8.0", + "google/protobuf": "^3.3.0", + "open-telemetry/api": "self.version", + "open-telemetry/exporter-otlp-common": "self.version", + "open-telemetry/gen-otlp-protobuf": "self.version", + "open-telemetry/sdk": "self.version", + "php-http/async-client-implementation": "^1.0", + "php-http/discovery": "^1.14", + "psr/http-factory-implementation": "^1.0" + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\Contrib\\OtlpHttp\\": "." + } + }, + "suggest": { + "ext-protobuf": "For more performant protobuf exporting" + } +} diff --git a/src/Contrib/README.md b/src/Contrib/README.md new file mode 100644 index 000000000..8335cba4a --- /dev/null +++ b/src/Contrib/README.md @@ -0,0 +1 @@ +# OpenTelemetry contrib diff --git a/src/Contrib/Zipkin/README.md b/src/Contrib/Zipkin/README.md new file mode 100644 index 000000000..739e43463 --- /dev/null +++ b/src/Contrib/Zipkin/README.md @@ -0,0 +1,7 @@ +# OpenTelemetry Zipkin Exporter + +Zipkin exporter for OpenTelemetry. + +## Usage + +See https://github.com/open-telemetry/opentelemetry-php/blob/main/examples/traces/features/exporters/zipkin.php diff --git a/src/Contrib/Zipkin/composer.json b/src/Contrib/Zipkin/composer.json new file mode 100644 index 000000000..167ca1e2f --- /dev/null +++ b/src/Contrib/Zipkin/composer.json @@ -0,0 +1,26 @@ +{ + "name": "open-telemetry/exporter-zipkin", + "description": "Zipkin exporter for OpenTelemetry PHP.", + "keywords": ["opentelemetry", "otel", "tracing", "apm", "zipkin"], + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "require": { + "php": "^7.4 || ^8.0", + "open-telemetry/api": "self.version", + "open-telemetry/sdk": "self.version", + "php-http/async-client-implementation": "^1.0", + "php-http/discovery": "^1.14", + "psr/http-factory-implementation": "^1.0" + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\Contrib\\Newrelic\\": "." + } + } +} diff --git a/src/Contrib/ZipkinToNewrelic/README.md b/src/Contrib/ZipkinToNewrelic/README.md new file mode 100644 index 000000000..17f1b12d3 --- /dev/null +++ b/src/Contrib/ZipkinToNewrelic/README.md @@ -0,0 +1,7 @@ +# OpenTelemetry Zipkin to New Relic Exporter + +_Experimental_ New Relic exporter for OpenTelemetry, which uses the Zipkin protocol. + +## Usage + +See https://github.com/open-telemetry/opentelemetry-php/blob/main/examples/traces/features/exporters/zipkin_to_newrelic.php diff --git a/src/Contrib/ZipkinToNewrelic/composer.json b/src/Contrib/ZipkinToNewrelic/composer.json new file mode 100644 index 000000000..938bfa474 --- /dev/null +++ b/src/Contrib/ZipkinToNewrelic/composer.json @@ -0,0 +1,26 @@ +{ + "name": "open-telemetry/exporter-zipkintonewrelic", + "description": "Zipkin to New Relic exporter for OpenTelemetry PHP.", + "keywords": ["opentelemetry", "otel", "tracing", "zipkin", "newrelic"], + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "require": { + "php": "^7.4 || ^8.0", + "open-telemetry/api": "self.version", + "open-telemetry/sdk": "self.version", + "php-http/async-client-implementation": "^1.0", + "php-http/discovery": "^1.14", + "psr/http-factory-implementation": "^1.0" + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\Contrib\\ZipkinToNewrelic\\": "." + } + } +} diff --git a/src/SDK/README.md b/src/SDK/README.md new file mode 100644 index 000000000..659dcf79f --- /dev/null +++ b/src/SDK/README.md @@ -0,0 +1 @@ +# OpenTelemetry SDK \ No newline at end of file diff --git a/src/SemConv/README.md b/src/SemConv/README.md new file mode 100644 index 000000000..c3de7a4b4 --- /dev/null +++ b/src/SemConv/README.md @@ -0,0 +1 @@ +# OpenTelemetry Semantic Conventions diff --git a/thrift/jaeger/README.md b/thrift/jaeger/README.md new file mode 100644 index 000000000..1154f6a24 --- /dev/null +++ b/thrift/jaeger/README.md @@ -0,0 +1 @@ +# OpenTelemetry Jaeger Thrift files \ No newline at end of file From 582b1d3ba5d5788aae0ca5dce66b595e56ae5186 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Tue, 23 Aug 2022 10:20:34 +1000 Subject: [PATCH 2/7] gitsplit swoole context --- .gitsplit.yml | 2 ++ src/Contrib/Context/Swoole/README.md | 1 + src/Contrib/Context/Swoole/composer.json | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 src/Contrib/Context/Swoole/README.md create mode 100644 src/Contrib/Context/Swoole/composer.json diff --git a/.gitsplit.yml b/.gitsplit.yml index f9c92e0d3..8c8d41bcb 100644 --- a/.gitsplit.yml +++ b/.gitsplit.yml @@ -34,6 +34,8 @@ splits: target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-zipkin.git" - prefix: "src/Contrib/ZipkinToNewrelic" target: "https://${GH_TOKEN}@github.com/opentelemetry-php/exporter-zipkintonewrelic.git" + - prefix: "src/Contrib/Context/Swoole" + target: "https://${GH_TOKEN}@github.com/opentelemetry-php/context-swoole.git" # List of references to split (defined as regexp) origins: diff --git a/src/Contrib/Context/Swoole/README.md b/src/Contrib/Context/Swoole/README.md new file mode 100644 index 000000000..5be9b6bb5 --- /dev/null +++ b/src/Contrib/Context/Swoole/README.md @@ -0,0 +1 @@ +# OpenTelemetry Swoole context diff --git a/src/Contrib/Context/Swoole/composer.json b/src/Contrib/Context/Swoole/composer.json new file mode 100644 index 000000000..7bdc6e031 --- /dev/null +++ b/src/Contrib/Context/Swoole/composer.json @@ -0,0 +1,23 @@ +{ + "name": "open-telemetry/context-swoole", + "description": "Async Swoole context implementation for OpenTelemetry PHP.", + "keywords": ["opentelemetry", "otel", "context", "swoole", "coroutine"], + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "opentelemetry-php contributors", + "homepage": "https://github.com/open-telemetry/opentelemetry-php/graphs/contributors" + } + ], + "require": { + "php": "^7.4 || ^8.0", + "open-telemetry/context": "self.version", + "ext-openswoole": "^4" + }, + "autoload": { + "psr-4": { + "OpenTelemetry\\Contrib\\Context\\Swoolo\\": "." + } + } +} From ab3636a42ea50289b988e98f3a6a02082cb02db2 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Tue, 23 Aug 2022 14:09:34 +1000 Subject: [PATCH 3/7] typo --- src/Contrib/Context/Swoole/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Contrib/Context/Swoole/composer.json b/src/Contrib/Context/Swoole/composer.json index 7bdc6e031..8d74de335 100644 --- a/src/Contrib/Context/Swoole/composer.json +++ b/src/Contrib/Context/Swoole/composer.json @@ -17,7 +17,7 @@ }, "autoload": { "psr-4": { - "OpenTelemetry\\Contrib\\Context\\Swoolo\\": "." + "OpenTelemetry\\Contrib\\Context\\Swoole\\": "." } } } From f304b4b9605b70ec99c3f58ee40bc776a5358881 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Thu, 25 Aug 2022 13:30:11 +1000 Subject: [PATCH 4/7] remove openswoole require --- src/Contrib/Context/Swoole/composer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Contrib/Context/Swoole/composer.json b/src/Contrib/Context/Swoole/composer.json index 8d74de335..732cfb640 100644 --- a/src/Contrib/Context/Swoole/composer.json +++ b/src/Contrib/Context/Swoole/composer.json @@ -1,7 +1,7 @@ { "name": "open-telemetry/context-swoole", - "description": "Async Swoole context implementation for OpenTelemetry PHP.", - "keywords": ["opentelemetry", "otel", "context", "swoole", "coroutine"], + "description": "Async Swoole/OpenSwoole context implementation for OpenTelemetry PHP.", + "keywords": ["opentelemetry", "otel", "context", "swoole", "openswoole", "coroutine"], "type": "library", "license": "Apache-2.0", "authors": [ @@ -12,8 +12,7 @@ ], "require": { "php": "^7.4 || ^8.0", - "open-telemetry/context": "self.version", - "ext-openswoole": "^4" + "open-telemetry/context": "self.version" }, "autoload": { "psr-4": { From b13903f2d9cde2a83a375f912b3fc88719aeac22 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Mon, 29 Aug 2022 16:01:55 +1000 Subject: [PATCH 5/7] review feedback --- src/Contrib/Context/Swoole/composer.json | 2 +- src/Contrib/Jaeger/composer.json | 3 ++- src/Contrib/Newrelic/composer.json | 1 - src/Contrib/OtlpHttp/composer.json | 2 +- src/Contrib/Zipkin/composer.json | 4 ++-- src/Contrib/ZipkinToNewrelic/composer.json | 3 +-- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Contrib/Context/Swoole/composer.json b/src/Contrib/Context/Swoole/composer.json index 732cfb640..7364ae70a 100644 --- a/src/Contrib/Context/Swoole/composer.json +++ b/src/Contrib/Context/Swoole/composer.json @@ -1,7 +1,7 @@ { "name": "open-telemetry/context-swoole", "description": "Async Swoole/OpenSwoole context implementation for OpenTelemetry PHP.", - "keywords": ["opentelemetry", "otel", "context", "swoole", "openswoole", "coroutine"], + "keywords": ["opentelemetry", "otel", "contrib", "context", "swoole", "openswoole", "coroutine"], "type": "library", "license": "Apache-2.0", "authors": [ diff --git a/src/Contrib/Jaeger/composer.json b/src/Contrib/Jaeger/composer.json index 579f880d6..980ba5625 100644 --- a/src/Contrib/Jaeger/composer.json +++ b/src/Contrib/Jaeger/composer.json @@ -1,7 +1,7 @@ { "name": "open-telemetry/exporter-jaeger", "description": "jaeger exporter for OpenTelemetry PHP.", - "keywords": ["opentelemetry", "otel", "tracing", "logging", "apm", "jaeger"], + "keywords": ["opentelemetry", "otel", "tracing", "exporter", "contrib", "jaeger"], "type": "library", "license": "Apache-2.0", "authors": [ @@ -13,6 +13,7 @@ "require": { "php": "^7.4 || ^8.0", "open-telemetry/api": "self.version", + "open-telemetry/gen-jaeger-thrift": "self.version", "open-telemetry/sdk": "self.version", "php-http/async-client-implementation": "^1.0", "php-http/discovery": "^1.14", diff --git a/src/Contrib/Newrelic/composer.json b/src/Contrib/Newrelic/composer.json index a015699af..58cd6c85e 100644 --- a/src/Contrib/Newrelic/composer.json +++ b/src/Contrib/Newrelic/composer.json @@ -12,7 +12,6 @@ ], "require": { "php": "^7.4 || ^8.0", - "open-telemetry/api": "self.version", "open-telemetry/sdk": "self.version", "php-http/async-client-implementation": "^1.0", "php-http/discovery": "^1.14", diff --git a/src/Contrib/OtlpHttp/composer.json b/src/Contrib/OtlpHttp/composer.json index b276a4866..6c2d3a47b 100644 --- a/src/Contrib/OtlpHttp/composer.json +++ b/src/Contrib/OtlpHttp/composer.json @@ -1,7 +1,7 @@ { "name": "open-telemetry/exporter-otlp-http", "description": "HTTP/protobuf exporter for OpenTelemetry PHP.", - "keywords": ["opentelemetry", "otel", "tracing", "otlp", "protobuf"], + "keywords": ["opentelemetry", "otel", "tracing", "otlp", "protobuf", "http"], "type": "library", "license": "Apache-2.0", "authors": [ diff --git a/src/Contrib/Zipkin/composer.json b/src/Contrib/Zipkin/composer.json index 167ca1e2f..5e48f7c76 100644 --- a/src/Contrib/Zipkin/composer.json +++ b/src/Contrib/Zipkin/composer.json @@ -1,7 +1,7 @@ { "name": "open-telemetry/exporter-zipkin", "description": "Zipkin exporter for OpenTelemetry PHP.", - "keywords": ["opentelemetry", "otel", "tracing", "apm", "zipkin"], + "keywords": ["opentelemetry", "otel", "tracing", "contrib", "exporter", "zipkin"], "type": "library", "license": "Apache-2.0", "authors": [ @@ -20,7 +20,7 @@ }, "autoload": { "psr-4": { - "OpenTelemetry\\Contrib\\Newrelic\\": "." + "OpenTelemetry\\Contrib\\Zipkin\\": "." } } } diff --git a/src/Contrib/ZipkinToNewrelic/composer.json b/src/Contrib/ZipkinToNewrelic/composer.json index 938bfa474..c736e5f2b 100644 --- a/src/Contrib/ZipkinToNewrelic/composer.json +++ b/src/Contrib/ZipkinToNewrelic/composer.json @@ -1,7 +1,7 @@ { "name": "open-telemetry/exporter-zipkintonewrelic", "description": "Zipkin to New Relic exporter for OpenTelemetry PHP.", - "keywords": ["opentelemetry", "otel", "tracing", "zipkin", "newrelic"], + "keywords": ["opentelemetry", "otel", "tracing", "zipkin", "newrelic", "exporter", "contrib"], "type": "library", "license": "Apache-2.0", "authors": [ @@ -12,7 +12,6 @@ ], "require": { "php": "^7.4 || ^8.0", - "open-telemetry/api": "self.version", "open-telemetry/sdk": "self.version", "php-http/async-client-implementation": "^1.0", "php-http/discovery": "^1.14", From 8ce0f3a675e85996e2a2326105ec808fa904458f Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Mon, 29 Aug 2022 16:21:34 +1000 Subject: [PATCH 6/7] jaeger requires zipkin for http --- src/Contrib/Jaeger/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Contrib/Jaeger/composer.json b/src/Contrib/Jaeger/composer.json index 980ba5625..5751e8e15 100644 --- a/src/Contrib/Jaeger/composer.json +++ b/src/Contrib/Jaeger/composer.json @@ -14,6 +14,7 @@ "php": "^7.4 || ^8.0", "open-telemetry/api": "self.version", "open-telemetry/gen-jaeger-thrift": "self.version", + "open-telemetry/exporter-zipkin": "self.version", "open-telemetry/sdk": "self.version", "php-http/async-client-implementation": "^1.0", "php-http/discovery": "^1.14", From 2cc66bed04f29c4c65ca4b3bb71a7064fb14d9d1 Mon Sep 17 00:00:00 2001 From: Brett McBride Date: Mon, 29 Aug 2022 21:06:57 +1000 Subject: [PATCH 7/7] adding metrics tag to metrics-related contrib --- src/Contrib/Otlp/composer.json | 2 +- src/Contrib/OtlpHttp/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Contrib/Otlp/composer.json b/src/Contrib/Otlp/composer.json index d5f6cd6cc..7ce2735b9 100644 --- a/src/Contrib/Otlp/composer.json +++ b/src/Contrib/Otlp/composer.json @@ -1,7 +1,7 @@ { "name": "open-telemetry/exporter-otlp-common", "description": "OTLP common code for OpenTelemetry exporters.", - "keywords": ["opentelemetry", "otel", "tracing", "exporter", "otlp", "grpc"], + "keywords": ["opentelemetry", "otel", "tracing", "metrics", "exporter", "otlp", "grpc"], "type": "library", "license": "Apache-2.0", "authors": [ diff --git a/src/Contrib/OtlpHttp/composer.json b/src/Contrib/OtlpHttp/composer.json index 6c2d3a47b..a1a6f8039 100644 --- a/src/Contrib/OtlpHttp/composer.json +++ b/src/Contrib/OtlpHttp/composer.json @@ -1,7 +1,7 @@ { "name": "open-telemetry/exporter-otlp-http", "description": "HTTP/protobuf exporter for OpenTelemetry PHP.", - "keywords": ["opentelemetry", "otel", "tracing", "otlp", "protobuf", "http"], + "keywords": ["opentelemetry", "otel", "tracing", "metrics", "otlp", "protobuf", "http"], "type": "library", "license": "Apache-2.0", "authors": [