Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleaning up the examples a little #741

Merged
merged 15 commits into from
Jul 3, 2022
Merged

Cleaning up the examples a little #741

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dcf1748
Rename examples to snake case
Grunet Jul 2, 2022
17be89c
Move examples into signal specific folders
Grunet Jul 2, 2022
02f829f
Moving the exporter-specific examples into their own directory
Grunet Jul 2, 2022
d0a1c1e
Update import paths for autoload.php
Grunet Jul 2, 2022
985237d
Move the rest into a dedicated features folder
Grunet Jul 2, 2022
8c33050
Renaming the distributed-tracing folder to be slightly more self-expl…
Grunet Jul 2, 2022
996646d
Move exporters folder underneath features folder
Grunet Jul 2, 2022
1d47332
Woops forgot to update the Makefile too
Grunet Jul 2, 2022
414c4b2
clarify the catch is not for otel-php but app code people might fill …
Grunet Jul 2, 2022
e892502
Removing sampling from examples that don't need to involve it
Grunet Jul 2, 2022
34150cc
Simplify names of the exporter example files
Grunet Jul 2, 2022
109f83e
Point back to the right vendor folder for the tracing demo
Grunet Jul 3, 2022
8518fff
Try get the demo a little closer back to actually working
Grunet Jul 3, 2022
22f28bb
Add in a make target for smoke testing more of the examples
Grunet Jul 3, 2022
efedfd7
clarify how to speed up one of the slow smoke tests
Grunet Jul 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@ phpmetrics:
$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpmetrics --config=./phpmetrics.json --junit=junit.xml
trace examples: FORCE
docker-compose up -d --remove-orphans
$(DC_RUN_PHP) php ./examples/AlwaysOnZipkinExample.php
$(DC_RUN_PHP) php ./examples/AlwaysOffTraceExample.php
$(DC_RUN_PHP) php ./examples/AlwaysOnJaegerExample.php
$(DC_RUN_PHP) php ./examples/traces/features/exporters/zipkin.php
$(DC_RUN_PHP) php ./examples/traces/features/always_off_trace_example.php
$(DC_RUN_PHP) php ./examples/traces/features/exporters/jaeger.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/AlwaysOnNewrelicExample.php
docker-compose run -e NEW_RELIC_ENDPOINT -e NEW_RELIC_INSERT_KEY --rm php php ./examples/AlwaysOnZipkinToNewrelicExample.php
docker-compose run -e NEW_RELIC_ENDPOINT -e NEW_RELIC_INSERT_KEY --rm php php ./examples/traces/features/exporters/newrelic.php
docker-compose run -e NEW_RELIC_ENDPOINT -e NEW_RELIC_INSERT_KEY --rm php php ./examples/traces/features/exporters/zipkin_to_newrelic.php
docker-compose stop
collector:
docker-compose -f docker-compose.collector.yaml up -d --remove-orphans
docker-compose -f docker-compose.collector.yaml run -e OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317 --rm php php ./examples/AlwaysOnOTLPGrpcExample.php
docker-compose -f docker-compose.collector.yaml run -e OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317 --rm php php ./examples/traces/features/exporters/otlp_grpc.php
docker-compose -f docker-compose.collector.yaml stop

fiber-ffi-example:
@docker-compose -f docker-compose.fiber-ffi.yaml -p opentelemetry-php_fiber-ffi-example up -d web
metrics-prometheus-example:
@docker-compose -f docker-compose.prometheus.yaml -p opentelemetry-php_metrics-prometheus-example up -d web
@docker-compose -f docker-compose.prometheus.yaml -p opentelemetry-php_metrics-prometheus-example run --rm php php examples/prometheus/PrometheusMetricsExample.php
@docker-compose -f docker-compose.prometheus.yaml -p opentelemetry-php_metrics-prometheus-example run --rm php php examples/metrics/prometheus/prometheus_metrics_example.php
stop-prometheus:
@docker-compose -f docker-compose.prometheus.yaml -p opentelemetry-php_metrics-prometheus-example stop
protobuf:
Expand Down
95 changes: 0 additions & 95 deletions examples/AlwaysOnNewrelicExample.php
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions examples/AlwaysOnOTLPGrpcExample1.php
View file
Open in desktop

This file was deleted.

113 changes: 0 additions & 113 deletions examples/AlwaysOnOTLPGrpcExample2.php
View file
Open in desktop

This file was deleted.

Loading