Merge branch 'main' into python-to-zero-code

open-telemetry · Jun 20, 2024 · 1be47de · 1be47de
2 parents 3ccfb5e + 4dc9422
commit 1be47de
Show file tree

Hide file tree

Showing 189 changed files with 207 additions and 208 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -45,6 +45,7 @@ content/en/docs/zero-code/java/          @open-telemetry/docs-approvers @open-te
 content/en/docs/zero-code/js/            @open-telemetry/docs-approvers @open-telemetry/javascript-approvers
 content/en/docs/zero-code/net/           @open-telemetry/docs-approvers @open-telemetry/dotnet-approvers @open-telemetry/dotnet-instrumentation-approvers
 content/en/docs/zero-code/python/        @open-telemetry/docs-approvers @open-telemetry/python-approvers
+content/en/docs/zero-code/php/           @open-telemetry/docs-approvers @open-telemetry/php-approvers
 content/en/ecosystem/demo/               @open-telemetry/demo-approvers @open-telemetry/demo-approvers
 content/zh/                              @open-telemetry/docs-maintainers @open-telemetry/docs-zh-approvers
 content/ja/                              @open-telemetry/docs-maintainers @open-telemetry/docs-ja-approvers

diff --git a/content/en/blog/2023/php-auto-instrumentation/index.md b/content/en/blog/2023/php-auto-instrumentation/index.md
@@ -153,7 +153,7 @@ We have all necessary components in place:
   and frameworks.
 - Development tools that can help lower barrier for users and developers
   interested in instrumenting arbitrary code.
-- [Documentation](/docs/languages/php/automatic/)
+- [Documentation](/docs/zero-code/php/)
 
 One of our goals is to increase awareness of this work and involve more people
 that will help us improve it, extend coverage and fix bugs.

diff --git a/content/en/docs/concepts/instrumentation/zero-code.md b/content/en/docs/concepts/instrumentation/zero-code.md
@@ -47,5 +47,5 @@ Automatic instrumentation is available for the following languages:
 - [.NET](/docs/zero-code/net/)
 - [Java](/docs/zero-code/java/)
 - [JavaScript](/docs/zero-code/js/)
-- [PHP](/docs/languages/php/automatic/)
+- [PHP](/docs/zero-code/php/)
 - [Python](/docs/zero-code/python/)
diff --git a/content/en/docs/languages/php/exporters.md b/content/en/docs/languages/php/exporters.md
@@ -8,9 +8,9 @@ cSpell:ignore: fastcgi pecl
 
 {{% alert title="Note" color="info" %}}
 
-If you use [automatic instrumentation](/docs/languages/php/automatic/) you can
-setup exporters with
-[zero-code configuration to setup exporters](/docs/languages/php/automatic/#zero-code-configuration-for-automatic-instrumentation).
+If you use [zero-code instrumentation](/docs/zero-code/php/) you can set up
+exporters with
+[zero-code configuration to setup exporters](/docs/zero-code/php#zero-code-configuration-for-automatic-instrumentation).
 
 {{% /alert %}}
 

diff --git a/content/en/docs/languages/php/getting-started.md b/content/en/docs/languages/php/getting-started.md
@@ -10,13 +10,13 @@ OpenTelemetry for PHP can be used to generate and export [traces][], [metrics][]
 and [logs][].
 
 This page will show you how to get started with OpenTelemetry in PHP. We will
-create a simple "roll the dice" application, then apply both automatic and
-manual instrumentation to generate [traces][] and export them to the console. We
+create a simple "roll the dice" application, then apply both zero-code and code
+based instrumentation to generate [traces][] and export them to the console. We
 will then emit some [logs][] which will also be sent to the console.
 
 ## Prerequisites
 
-OpenTelemetry requires PHP 8.0+ for automatic instrumentation, however manual
+OpenTelemetry requires PHP 8.0+ for zero-code instrumentation, however manual
 instrumentation will work with PHP 7.4
 
 Ensure that you have the following installed:
@@ -86,10 +86,10 @@ php -S localhost:8080
 Open <http://localhost:8080/rolldice> in your web browser to ensure it is
 working.
 
-## Add automatic instrumentation
+## Add zero-code instrumentation
 
 Next, you’ll use the OpenTelemetry PHP extension to
-[automatically instrument](../automatic/) the application.
+[automatically instrument](/docs/zero-code/php/) the application.
 
 1. Since the extension is built from source, you need to install some build
    tools
@@ -116,7 +116,8 @@ Next, you’ll use the OpenTelemetry PHP extension to
 
    {{% alert title="Note" color="warning" %}}Alternative methods of installing
    the extension are detailed in
-   [automatic instrumentation](../automatic/#installation). {{% /alert %}}
+   [zero-code instrumentation](/docs/zero-code/php/#installation).
+   {{% /alert %}}
 
 3. Add the extension to your `php.ini` file:
 
@@ -487,7 +488,7 @@ values correspond to the active span at the time the log message was generated.
 For more:
 
 - Run this example with another [exporter][] for telemetry data.
-- Try [automatic instrumentation](../automatic/) on one of your own apps.
+- Try [zero-code instrumentation](/docs/zero-code/php/) on one of your own apps.
 - Learn more about [manual instrumentation][] and try out some [examples](/docs/languages/php/examples/).
 - Take a look at the [OpenTelemetry Demo](/docs/demo/), which includes the PHP
   based [Quote Service](/docs/demo/services/quote/).

diff --git a/content/en/docs/languages/php/libraries.md b/content/en/docs/languages/php/libraries.md
@@ -37,7 +37,7 @@ You can turn off any instrumentation by adding its identifier to the
 ## Available instrumentation libraries
 
 For a list of available instrumentations, see
-[OpenTelemetry instrumentation packages](https://packagist.org/search/?query=open-telemetry&tags=instrumentation)
+[OpenTelemetry instrumentation libraries](https://packagist.org/search/?query=open-telemetry&tags=instrumentation)
 on Packagist.
 
 ## Next steps
@@ -49,7 +49,3 @@ custom telemetry data.
 You might also want to configure an appropriate exporter to
 [export your telemetry data](/docs/languages/php/exporters) to one or more
 telemetry backends.
-
-You can also check the
-[automatic instrumentation for PHP](/docs/languages/php/automatic) for existing
-library instrumentations.
diff --git a/content/en/docs/languages/php/automatic.md → content/en/docs/zero-code/php.md b/content/en/docs/languages/php/automatic.md → content/en/docs/zero-code/php.md
@@ -1,7 +1,8 @@
 ---
-title: Automatic Instrumentation
-linkTitle: Automatic
+title: PHP zero-code instrumentation
+linkTitle: PHP
 weight: 30
+aliases: [/docs/languages/php/automatic]
 # prettier-ignore
 cSpell:ignore: centos configurator democlass epel myapp pecl phar remi unindented userland
 ---
@@ -15,13 +16,13 @@ method runs.
 {{% alert title="Important" color="warning" %}}Installing the OpenTelemetry
 extension by itself will not generate traces. You must also install the
 [SDK](https://packagist.org/packages/open-telemetry/sdk) **and** one or more
-[instrumentation packages](/ecosystem/registry/?component=instrumentation&language=php)
+[instrumentation libraries](/ecosystem/registry/?component=instrumentation&language=php)
 for the frameworks and libraries that you are using, or alternatively write your
 own.
 
 You also _must_ use
 [composer autoloading](https://getcomposer.org/doc/01-basic-usage.md#autoloading),
-as this is the mechanism all auto-instrumentation packages use to register
+as this is the mechanism all instrumentation libraries use to register
 themselves. {{% /alert %}}
 
 ## Example
@@ -224,8 +225,8 @@ commonly used PHP libraries. For the full list, see
 ## Next steps
 
 After you have automatic instrumentation configured for your app or service, you
-might want to add [manual instrumentation](../instrumentation) to collect custom
-telemetry data.
+might want to add [manual instrumentation](/docs/languages/php/instrumentation)
+to collect custom telemetry data.
 
 For more examples, see
 [opentelemetry-php-contrib/examples](https://github.com/open-telemetry/opentelemetry-php-contrib/tree/main/examples).
diff --git a/data/registry/collector-exporter-alertmanager.yml b/data/registry/collector-exporter-alertmanager.yml
@@ -17,7 +17,7 @@ authors:
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter
-  version: v0.102.0
+  version: v0.103.0
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/alertmanagerexporter
 createdAt: 2023-12-05
diff --git a/data/registry/collector-exporter-alibaba-cloud-log-service.yml b/data/registry/collector-exporter-alibaba-cloud-log-service.yml
@@ -17,4 +17,4 @@ createdAt: 2021-02-24
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-aws-xray.yml b/data/registry/collector-exporter-aws-xray.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-awscloudwatchlogs.yml b/data/registry/collector-exporter-awscloudwatchlogs.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-awsemf.yml b/data/registry/collector-exporter-awsemf.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-awss3.yml b/data/registry/collector-exporter-awss3.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-azure-monitor.yml b/data/registry/collector-exporter-azure-monitor.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-azuredataexplorer.yml b/data/registry/collector-exporter-azuredataexplorer.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-carbon.yml b/data/registry/collector-exporter-carbon.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-cassandra.yml b/data/registry/collector-exporter-cassandra.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-clickhouse.yml b/data/registry/collector-exporter-clickhouse.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-coralogix.yml b/data/registry/collector-exporter-coralogix.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-datadog.yml b/data/registry/collector-exporter-datadog.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-dataset.yml b/data/registry/collector-exporter-dataset.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-elasticsearch.yml b/data/registry/collector-exporter-elasticsearch.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-file.yml b/data/registry/collector-exporter-file.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-googlecloud.yml b/data/registry/collector-exporter-googlecloud.yml
@@ -17,4 +17,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-googlecloudpubsub.yml b/data/registry/collector-exporter-googlecloudpubsub.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-googlemanagedprometheus.yml b/data/registry/collector-exporter-googlemanagedprometheus.yml
@@ -18,4 +18,4 @@ createdAt: 2022-10-27
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-honeycombmarker.yml b/data/registry/collector-exporter-honeycombmarker.yml
@@ -18,4 +18,4 @@ createdAt: 2023-10-17
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-influxdb.yml b/data/registry/collector-exporter-influxdb.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-instana.yml b/data/registry/collector-exporter-instana.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-kafka.yml b/data/registry/collector-exporter-kafka.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-kinetica.yml b/data/registry/collector-exporter-kinetica.yml
@@ -18,4 +18,4 @@ createdAt: 2023-09-19
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kineticaexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-load-balancing.yml b/data/registry/collector-exporter-load-balancing.yml
@@ -16,4 +16,4 @@ createdAt: 2020-10-22
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-logicmonitor.yml b/data/registry/collector-exporter-logicmonitor.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logicmonitorexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-logzio.yml b/data/registry/collector-exporter-logzio.yml
@@ -16,4 +16,4 @@ createdAt: 2020-10-22
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-loki.yml b/data/registry/collector-exporter-loki.yml
@@ -16,4 +16,4 @@ createdAt: 2020-10-22
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-mezmo.yml b/data/registry/collector-exporter-mezmo.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-opencensus.yml b/data/registry/collector-exporter-opencensus.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-opensearch.yml b/data/registry/collector-exporter-opensearch.yml
@@ -18,4 +18,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-otelarrow.yml b/data/registry/collector-exporter-otelarrow.yml
@@ -21,4 +21,4 @@ createdAt: 2024-02-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-prometheus-remote-write.yml b/data/registry/collector-exporter-prometheus-remote-write.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-prometheus.yml b/data/registry/collector-exporter-prometheus.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-pulsar.yml b/data/registry/collector-exporter-pulsar.yml
@@ -18,4 +18,4 @@ createdAt: 2022-10-27
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/pulsarexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-rabbitmq.yml b/data/registry/collector-exporter-rabbitmq.yml
@@ -17,4 +17,4 @@ createdAt: 2024-04-18
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/rabbitmqexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-sapm.yml b/data/registry/collector-exporter-sapm.yml
@@ -18,4 +18,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-sentry.yml b/data/registry/collector-exporter-sentry.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-signalfx.yml b/data/registry/collector-exporter-signalfx.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-skywalking.yml b/data/registry/collector-exporter-skywalking.yml
@@ -18,4 +18,4 @@ createdAt: 2022-10-27
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywalkingexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-splunk-hec.yml b/data/registry/collector-exporter-splunk-hec.yml
@@ -18,4 +18,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter
-  version: v0.102.0
+  version: v0.103.0
diff --git a/data/registry/collector-exporter-splunk-sapm.yml b/data/registry/collector-exporter-splunk-sapm.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter
-  version: v0.102.0
+  version: v0.103.0