Skip to content

Commit 0ed4bc9

Browse files
jerrytfleungjerrytfleung
authored
Merge branch 'main' into service_name_propagator
2 parents cd32ef6 + b10631f commit 0ed4bc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3634
-130
lines changed

‎.github/dependabot.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,13 @@ updates:
5757
# Maintain dependencies for all packages
5858
- package-ecosystem: "composer"
5959
directories:
60-
- "/examples/aws/AwsClientApp"
6160
- "/examples/instrumentation/Wordpress"
6261
- "/src/AutoInstrumentationInstaller"
6362
- "/src/Aws"
63+
- "/src/Aws/examples/AwsClientApp"
6464
- "/src/Context/Swoole"
65+
- "/src/Exporter/Instana"
66+
- "/src/Instrumentation/AwsSdk"
6567
- "/src/Instrumentation/CakePHP"
6668
- "/src/Instrumentation/CodeIgniter"
6769
- "/src/Instrumentation/Curl"
@@ -76,6 +78,7 @@ updates:
7678
- "/src/Instrumentation/MySqli"
7779
- "/src/Instrumentation/OpenAIPHP"
7880
- "/src/Instrumentation/PDO"
81+
- "/src/Instrumentation/PostgreSql"
7982
- "/src/Instrumentation/Psr14"
8083
- "/src/Instrumentation/Psr15"
8184
- "/src/Instrumentation/Psr16"
@@ -89,6 +92,7 @@ updates:
8992
- "/src/Instrumentation/Yii"
9093
- "/src/Logs/Monolog"
9194
- "/src/MetaPackages/opentelemetry"
95+
- "/src/Propagation/CloudTrace"
9296
- "/src/Propagation/Instana"
9397
- "/src/Propagation/ServerTiming"
9498
- "/src/Propagation/TraceResponse"

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
results_file: results.sarif
2929
results_format: sarif
3030
publish_results: true
31+
# file_mode is needed in this repo because .gitattributes excludes the .github directory
32+
# (see https://github.com/ossf/scorecard/issues/4679#issuecomment-3013550752)
33+
file_mode: git
3134

3235
# Upload the results as artifacts (optional). Commenting out will disable
3336
# uploads of run results in SARIF format to the repository Actions tab.
@@ -42,6 +45,6 @@ jobs:
4245
# Upload the results to GitHub's code scanning dashboard (optional).
4346
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4447
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
48+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
4649
with:
4750
sarif_file: results.sarif

‎.github/workflows/php.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
'Instrumentation/MySqli',
4242
'Instrumentation/OpenAIPHP',
4343
'Instrumentation/PDO',
44+
'Instrumentation/PostgreSql',
4445
# Sort PSRs numerically.
4546
'Instrumentation/Psr3',
4647
'Instrumentation/Psr6',
@@ -53,6 +54,7 @@ jobs:
5354
'Instrumentation/Symfony',
5455
'Instrumentation/Yii',
5556
'Logs/Monolog',
57+
'Propagation/CloudTrace',
5658
'Propagation/Instana',
5759
'Propagation/ServerTiming',
5860
'Propagation/TraceResponse',
@@ -78,6 +80,8 @@ jobs:
7880
php-version: 8.1
7981
- project: 'Instrumentation/PDO'
8082
php-version: 8.1
83+
- project: 'Instrumentation/PostgreSql'
84+
php-version: 8.1
8185
steps:
8286
- uses: actions/checkout@v4
8387

@@ -86,7 +90,7 @@ jobs:
8690
with:
8791
php-version: ${{ matrix.php-version }}
8892
coverage: xdebug
89-
extensions: ast, amqp, grpc, opentelemetry, rdkafka, mysqli
93+
extensions: ast, amqp, grpc, opentelemetry, rdkafka, mysqli, pgsql
9094

9195
- name: Validate composer.json and composer.lock
9296
run: composer validate
@@ -151,6 +155,11 @@ jobs:
151155
run: |
152156
docker compose up mysql -d --wait
153157
158+
- name: Start PostgreSql
159+
if: ${{ matrix.project == 'Instrumentation/PostgreSql' }}
160+
run: |
161+
docker compose up postgresql -d --wait
162+
154163
- name: Run PHPUnit
155164
working-directory: src/${{ matrix.project }}
156165
run: vendor/bin/phpunit

‎.github/workflows/split_monorepo.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ permissions:
1515
jobs:
1616
gitsplit:
1717
runs-on: ubuntu-latest
18+
permissions:
19+
contents: write # required for pushing changes
1820
steps:
1921
- name: checkout
2022
run: git clone "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" "$GITHUB_WORKSPACE" && cd "$GITHUB_WORKSPACE" && git checkout $GITHUB_SHA

‎.gitsplit.yml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,24 @@ project_url: "https://github.com/open-telemetry/opentelemetry-php-contrib.git"
66

77
# List of splits.
88
splits:
9-
- prefix: "src/MetaPackages/opentelemetry"
10-
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/opentelemetry-meta.git"
9+
- prefix: "src/AutoInstrumentationInstaller"
10+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-instrumentation-installer.git"
1111
- prefix: "src/Aws"
1212
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-aws.git"
13+
- prefix: "src/Context/Swoole"
14+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/context-swoole.git"
1315
- prefix: "src/Exporter/Instana"
1416
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-exporter-instana.git"
15-
- prefix: "src/Symfony"
16-
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sdk-bundle.git"
17+
- prefix: "src/Instrumentation/AwsSdk"
18+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-aws-sdk.git"
19+
- prefix: "src/Instrumentation/CakePHP"
20+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-cakephp.git"
1721
- prefix: "src/Instrumentation/CodeIgniter"
1822
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-codeigniter.git"
1923
- prefix: "src/Instrumentation/Curl"
2024
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-curl.git"
25+
- prefix: "src/Instrumentation/Doctrine"
26+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-doctrine.git"
2127
- prefix: "src/Instrumentation/ExtAmqp"
2228
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-ext-amqp.git"
2329
- prefix: "src/Instrumentation/ExtRdKafka"
@@ -38,6 +44,8 @@ splits:
3844
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-openai.git"
3945
- prefix: "src/Instrumentation/PDO"
4046
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-pdo.git"
47+
- prefix: "src/Instrumentation/PostgreSql"
48+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-postgresql.git"
4149
- prefix: "src/Instrumentation/Psr3"
4250
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-psr3.git"
4351
- prefix: "src/Instrumentation/Psr6"
@@ -58,20 +66,14 @@ splits:
5866
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-symfony.git"
5967
- prefix: "src/Instrumentation/Wordpress"
6068
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-wordpress.git"
61-
- prefix: "src/Instrumentation/CakePHP"
62-
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-cakephp.git"
6369
- prefix: "src/Instrumentation/Yii"
6470
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-yii.git"
65-
- prefix: "src/Instrumentation/Doctrine"
66-
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-doctrine.git"
67-
- prefix: "src/Instrumentation/AwsSdk"
68-
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-auto-aws-sdk.git"
69-
- prefix: "src/Context/Swoole"
70-
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/context-swoole.git"
71-
- prefix: "src/AutoInstrumentationInstaller"
72-
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-instrumentation-installer.git"
7371
- prefix: "src/Logs/Monolog"
7472
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-logger-monolog.git"
73+
- prefix: "src/MetaPackages/opentelemetry"
74+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/opentelemetry-meta.git"
75+
- prefix: "src/Propagation/CloudTrace"
76+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-cloudtrace.git"
7577
- prefix: "src/Propagation/Instana"
7678
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-propagator-instana.git"
7779
- prefix: "src/Propagation/ServerTiming"
@@ -88,6 +90,8 @@ splits:
8890
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sampler-rulebased.git"
8991
- prefix: "src/Shims/OpenTracing"
9092
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-shim-opentracing.git"
93+
- prefix: "src/Symfony"
94+
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-sdk-bundle.git"
9195
- prefix: "src/Utils/Test"
9296
target: "https://${GH_TOKEN}@github.com/opentelemetry-php/contrib-utils-test.git"
9397
# List of references to split (defined as regexp)

‎composer.json‎

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
"OpenTelemetry\\Contrib\\Aws\\": "src/Aws/src",
1919
"OpenTelemetry\\Contrib\\Context\\Swoole\\": "src/Context/Swoole/src",
2020
"OpenTelemetry\\Contrib\\Exporter\\Instana\\": "src/Exporter/Instana/src",
21+
"OpenTelemetry\\Contrib\\Instrumentation\\AwsSdk\\": "src/Instrumentation/AwsSdk/src",
2122
"OpenTelemetry\\Contrib\\Instrumentation\\CakePHP\\": "src/Instrumentation/CakePHP/src",
2223
"OpenTelemetry\\Contrib\\Instrumentation\\CodeIgniter\\": "src/Instrumentation/CodeIgniter/src",
2324
"OpenTelemetry\\Contrib\\Instrumentation\\Curl\\": "src/Instrumentation/Curl/src",
25+
"OpenTelemetry\\Contrib\\Instrumentation\\Doctrine\\": "src/Instrumentation/Doctrine/src",
2426
"OpenTelemetry\\Contrib\\Instrumentation\\ExtAmqp\\": "src/Instrumentation/ExtAmqp/src",
2527
"OpenTelemetry\\Contrib\\Instrumentation\\ExtRdKafka\\": "src/Instrumentation/ExtRdKafka/src",
2628
"OpenTelemetry\\Contrib\\Instrumentation\\Guzzle\\": "src/Instrumentation/Guzzle/src",
@@ -43,18 +45,25 @@
4345
"OpenTelemetry\\Contrib\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/src",
4446
"OpenTelemetry\\Contrib\\Instrumentation\\Yii\\": "src/Instrumentation/Yii/src",
4547
"OpenTelemetry\\Contrib\\Logs\\Monolog\\": "src/Logs/Monolog/src",
48+
"OpenTelemetry\\Contrib\\Propagation\\CloudTrace\\": "src/Propagation/CloudTrace/src",
4649
"OpenTelemetry\\Contrib\\Propagation\\Instana\\": "src/Propagation/Instana/src",
4750
"OpenTelemetry\\Contrib\\Propagation\\ServerTiming\\": "src/Propagation/ServerTiming/src",
4851
"OpenTelemetry\\Contrib\\Propagation\\TraceResponse\\": "src/Propagation/TraceResponse/src",
52+
"OpenTelemetry\\Contrib\\Resource\\Detector\\Azure\\": "src/ResourceDetectors/Azure/src",
4953
"OpenTelemetry\\Contrib\\Resource\\Detector\\Container\\": "src/ResourceDetectors/Container/src",
5054
"OpenTelemetry\\Contrib\\Resource\\Detector\\DigitalOcean\\": "src/ResourceDetectors/DigitalOcean/src",
55+
"OpenTelemetry\\Contrib\\Sampler\\RuleBased\\": "src/Sampler/RuleBased/src",
5156
"OpenTelemetry\\Contrib\\Shim\\OpenTracing\\": "src/Shims/OpenTracing/src",
52-
"OpenTelemetry\\Contrib\\Symfony\\": "src/Symfony/src"
57+
"OpenTelemetry\\Contrib\\Symfony\\": "src/Symfony/src",
58+
"OpenTelemetry\\TestUtils\\": "src/Utils/Test/src"
5359
},
5460
"files": [
61+
"src/Exporter/Instana/_register.php",
62+
"src/Instrumentation/AwsSdk/_register.php",
5563
"src/Instrumentation/CakePHP/_register.php",
5664
"src/Instrumentation/CodeIgniter/_register.php",
5765
"src/Instrumentation/Curl/_register.php",
66+
"src/Instrumentation/Doctrine/_register.php",
5867
"src/Instrumentation/ExtAmqp/_register.php",
5968
"src/Instrumentation/ExtRdKafka/_register.php",
6069
"src/Instrumentation/Guzzle/_register.php",
@@ -76,34 +85,70 @@
7685
"src/Instrumentation/Symfony/_register.php",
7786
"src/Instrumentation/Wordpress/_register.php",
7887
"src/Instrumentation/Yii/_register.php",
88+
"src/Propagation/CloudTrace/_register.php",
89+
"src/Propagation/Instana/_register.php",
90+
"src/ResourceDetectors/Azure/_register.php",
7991
"src/ResourceDetectors/Container/_register.php",
8092
"src/ResourceDetectors/DigitalOcean/_register.php"
8193
]
8294
},
8395
"autoload-dev": {
8496
"psr-4": {
85-
"OpenTelemetry\\TestUtils\\": "src/",
86-
"OpenTelemetry\\TestUtils\\Tests\\": "tests/"
97+
"OpenTelemetry\\Tests\\Aws\\": "src/Aws/tests",
98+
"OpenTelemetry\\Tests\\Exporter\\Instana\\": "src/Exporter/Instana/tests",
99+
"OpenTelemetry\\Tests\\Instrumentation\\AwsSdk\\": "src/Instrumentation/AwsSdk/tests",
100+
"OpenTelemetry\\Tests\\Instrumentation\\CakePHP\\": "src/Instrumentation/CakePHP/tests",
101+
"OpenTelemetry\\Tests\\Instrumentation\\CakePHP\\Integration\\App\\": "src/Instrumentation/CakePHP/tests/Integration/App",
102+
"OpenTelemetry\\Tests\\Instrumentation\\CodeIgniter\\": "src/Instrumentation/CodeIgniter/tests",
103+
"OpenTelemetry\\Tests\\Instrumentation\\Curl\\": "src/Instrumentation/Curl/tests",
104+
"OpenTelemetry\\Tests\\Instrumentation\\Doctrine\\": "src/Instrumentation/Doctrine/tests",
105+
"OpenTelemetry\\Tests\\Instrumentation\\ExtAmqp\\tests\\": "src/Instrumentation/ExtAmqp/tests",
106+
"OpenTelemetry\\Tests\\Instrumentation\\ExtRdKafka\\tests\\": "src/Instrumentation/ExtRdKafka/tests",
107+
"OpenTelemetry\\Tests\\Instrumentation\\Guzzle\\": "src/Instrumentation/Guzzle/tests",
108+
"OpenTelemetry\\Tests\\Instrumentation\\IO\\": "src/Instrumentation/IO/tests",
109+
"OpenTelemetry\\Tests\\Contrib\\Instrumentation\\Laravel\\": "src/Instrumentation/Laravel/tests",
110+
"OpenTelemetry\\Tests\\Instrumentation\\MongoDB\\": "src/Instrumentation/MongoDB/tests",
111+
"OpenTelemetry\\Tests\\Instrumentation\\MySqli\\": "src/Instrumentation/MySqli/tests",
112+
"OpenTelemetry\\Contrib\\Instrumentation\\OpenAIPHP\\Tests\\": "src/Instrumentation/OpenAIPHP/tests",
113+
"OpenTelemetry\\Tests\\Instrumentation\\PDO\\": "src/Instrumentation/PDO/tests",
114+
"OpenTelemetry\\Tests\\Instrumentation\\Psr6\\": "src/Instrumentation/Psr6/tests",
115+
"OpenTelemetry\\Instrumentation\\Psr14\\Tests\\": "src/Instrumentation/Psr14/tests",
116+
"OpenTelemetry\\Tests\\Instrumentation\\Psr16\\": "src/Instrumentation/Psr16/tests",
117+
"OpenTelemetry\\Tests\\Instrumentation\\ReactPHP\\": "src/Instrumentation/ReactPHP/tests",
118+
"OpenTelemetry\\Tests\\Instrumentation\\Slim\\": "src/Instrumentation/Slim/tests",
119+
"OpenTelemetry\\Tests\\Instrumentation\\Symfony\\tests\\": "src/Instrumentation/Symfony/tests",
120+
"OpenTelemetry\\Tests\\Instrumentation\\Wordpress\\": "src/Instrumentation/Wordpress/tests",
121+
"OpenTelemetry\\Tests\\Instrumentation\\Yii\\": "src/Instrumentation/Yii/tests",
122+
"OpenTelemetry\\Tests\\Propagation\\CloudTrace\\": "src/Propagation/CloudTrace/tests",
123+
"OpenTelemetry\\Tests\\Resource\\Detector\\Azure\\": "src/ResourceDetectors/Azure/tests",
124+
"OpenTelemetry\\Contrib\\Resource\\Detector\\DigitalOcean\\": "src/ResourceDetectors/DigitalOcean/tests",
125+
"OpenTelemetry\\Tests\\Contrib\\Symfony\\": "src/Symfony/tests",
126+
"OpenTelemetry\\TestUtils\\Tests\\": "src/Utils/Test/tests"
87127
}
88128
},
89129
"replace": {
130+
"open-telemetry/context-swoole": "self.version",
90131
"open-telemetry/contrib-aws": "self.version",
91132
"open-telemetry/contrib-sdk-bundle": "self.version",
92-
"open-telemetry/context-swoole": "self.version",
133+
"open-telemetry/contrib-symfony-instrumentation-bundle": "self.version",
134+
"open-telemetry/detector-azure": "self.version",
135+
"open-telemetry/detector-container": "self.version",
136+
"open-telemetry/detector-digitalocean": "self.version",
137+
"open-telemetry/opentelemetry-auto-aws-sdk": "self.version",
93138
"open-telemetry/opentelemetry-auto-cakephp": "self.version",
94139
"open-telemetry/opentelemetry-auto-codeigniter": "self.version",
95140
"open-telemetry/opentelemetry-auto-curl": "self.version",
141+
"open-telemetry/opentelemetry-auto-doctrine": "self.version",
96142
"open-telemetry/opentelemetry-auto-ext-amqp": "self.version",
97-
"open-telemetry/opentelemetry-exporter-instana": "self.version",
98143
"open-telemetry/opentelemetry-auto-ext-rdkafka": "self.version",
99144
"open-telemetry/opentelemetry-auto-guzzle": "self.version",
100145
"open-telemetry/opentelemetry-auto-http-async": "self.version",
101146
"open-telemetry/opentelemetry-auto-io": "self.version",
102147
"open-telemetry/opentelemetry-auto-laravel": "self.version",
103148
"open-telemetry/opentelemetry-auto-mongodb": "self.version",
104149
"open-telemetry/opentelemetry-auto-mysqli": "self.version",
105-
"open-telemetry/opentelemetry-auto-pdo": "self.version",
106150
"open-telemetry/opentelemetry-auto-openai-php": "self.version",
151+
"open-telemetry/opentelemetry-auto-pdo": "self.version",
107152
"open-telemetry/opentelemetry-auto-psr3": "self.version",
108153
"open-telemetry/opentelemetry-auto-psr6": "self.version",
109154
"open-telemetry/opentelemetry-auto-psr14": "self.version",
@@ -115,14 +160,16 @@
115160
"open-telemetry/opentelemetry-auto-symfony": "self.version",
116161
"open-telemetry/opentelemetry-auto-wordpress": "self.version",
117162
"open-telemetry/opentelemetry-auto-yii": "self.version",
163+
"open-telemetry/opentelemetry-exporter-instana": "self.version",
164+
"open-telemetry/opentelemetry-instrumentation-installer": "self.version",
165+
"open-telemetry/opentelemetry-logger-monolog": "self.version",
166+
"open-telemetry/opentelemetry-propagation-cloudtrace": "self.version",
118167
"open-telemetry/opentelemetry-propagation-instana": "self.version",
119168
"open-telemetry/opentelemetry-propagation-server-timing": "self.version",
120169
"open-telemetry/opentelemetry-propagation-traceresponse": "self.version",
121-
"open-telemetry/opentelemetry-logger-monolog": "self.version",
122-
"open-telemetry/detector-container": "self.version",
123-
"open-telemetry/detector-digitalocean": "self.version",
124-
"open-telemetry/symfony-sdk-bundle": "self.version",
125170
"open-telemetry/opentracing-shim": "self.version",
171+
"open-telemetry/sampler-rule-based": "self.version",
172+
"open-telemetry/symfony-sdk-bundle": "self.version",
126173
"open-telemetry/test-utils": "self.version"
127174
},
128175
"config": {

‎docker-compose.yaml‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
services:
22
php:
3-
image: opentelemetry-php:local-${PHP_VERSION}-cli
4-
build:
5-
context: ./docker
6-
dockerfile: Dockerfile
7-
args:
8-
- PHP_VERSION:${PHP_VERSION}
3+
# the developer image comes from opentelemetry-php (the core repository), and is built by github actions
4+
image: ghcr.io/open-telemetry/opentelemetry-php/opentelemetry-php-base:${PHP_VERSION}
95
volumes:
106
- ./:/usr/src/myapp
117
user: "${PHP_USER}:root"
@@ -18,6 +14,7 @@ services:
1814
MONGODB_HOST: ${MONGODB_HOST:-mongodb}
1915
MONGODB_PORT: ${MONGODB_PORT:-27017}
2016
MYSQL_HOST: ${MYSQL_HOST:-mysql}
17+
POSTGRESQL_HOST: ${POSTGRESQL_HOST:-postgresql}
2118

2219
zipkin:
2320
image: openzipkin/zipkin-slim
@@ -88,3 +85,20 @@ services:
8885
retries: 3
8986
volumes:
9087
- ./docker/mysql/init.sql:/docker-entrypoint-initdb.d/init.sql
88+
89+
postgresql:
90+
image: postgres:17.5
91+
hostname: postgresql
92+
ports:
93+
- "5432:5432/tcp"
94+
environment:
95+
POSTGRES_DB: otel_db
96+
POSTGRES_USER: otel_user
97+
POSTGRES_PASSWORD: otel_passwd
98+
healthcheck:
99+
test: ["CMD-SHELL", "PGPASSWORD=otel_passwd psql -U otel_user -d otel_db -h 127.0.0.1 -c 'SELECT 1'"]
100+
interval: 30s
101+
timeout: 90s
102+
retries: 3
103+
volumes:
104+
- ./docker/postgresql/init.sql:/docker-entrypoint-initdb.d/init.sql

‎docker/Dockerfile‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)