File tree 4 files changed +19
-15
lines changed
packages/opentelemetry-test-utils/src
plugins/node/opentelemetry-instrumentation-mysql2
4 files changed +19
-15
lines changed Original file line number Diff line number Diff line change @@ -45,11 +45,11 @@ jobs:
45
45
--health-start-period 10s
46
46
--health-retries 20
47
47
mysql :
48
- image : circleci/ mysql:5.7
48
+ image : mysql:5.7
49
49
env :
50
50
MYSQL_USER : otel
51
51
MYSQL_PASSWORD : secret
52
- MYSQL_DATABASE : circle_database
52
+ MYSQL_DATABASE : otel_mysql_database
53
53
MYSQL_ROOT_PASSWORD : rootpw
54
54
ports :
55
55
- 3306:3306
@@ -59,10 +59,11 @@ jobs:
59
59
--health-timeout 5s
60
60
--health-retries 5
61
61
postgres :
62
- image : circleci/ postgres:9.6 -alpine
62
+ image : postgres:15 -alpine
63
63
env :
64
64
POSTGRES_USER : postgres
65
- POSTGRES_DB : circle_database
65
+ POSTGRES_DB : otel_pg_database
66
+ POSTGRES_PASSWORD : postgres
66
67
ports :
67
68
- 5432:5432
68
69
options : >-
@@ -91,17 +92,18 @@ jobs:
91
92
MONGODB_HOST : 127.0.0.1
92
93
MONGODB_PORT : 27017
93
94
MSSQL_PASSWORD : mssql_passw0rd
94
- MYSQL_DATABASE : circle_database
95
+ MYSQL_DATABASE : otel_mysql_database
95
96
MYSQL_HOST : localhost
96
97
MYSQL_PASSWORD : secret
97
98
MYSQL_PORT : 3306
98
99
MYSQL_USER : otel
99
100
OPENTELEMETRY_REDIS_HOST : localhost
100
101
OPENTELEMETRY_REDIS_PORT : 6379
101
- POSTGRES_DB : circle_database
102
+ POSTGRES_DB : otel_pg_database
102
103
POSTGRES_HOST : localhost
103
104
POSTGRES_PORT : 5432
104
105
POSTGRES_USER : postgres
106
+ POSTGRES_PASSWORD : postgres
105
107
RUN_MONGODB_TESTS : 1
106
108
RUN_MSSQL_TESTS : 1
107
109
RUN_MYSQL_TESTS : 1
Original file line number Diff line number Diff line change @@ -40,11 +40,11 @@ jobs:
40
40
--health-start-period 10s
41
41
--health-retries 20
42
42
mysql :
43
- image : circleci/ mysql:5.7
43
+ image : mysql:5.7
44
44
env :
45
45
MYSQL_USER : otel
46
46
MYSQL_PASSWORD : secret
47
- MYSQL_DATABASE : circle_database
47
+ MYSQL_DATABASE : otel_mysql_database
48
48
MYSQL_ROOT_PASSWORD : rootpw
49
49
ports :
50
50
- 3306:3306
@@ -54,10 +54,11 @@ jobs:
54
54
--health-timeout 5s
55
55
--health-retries 5
56
56
postgres :
57
- image : circleci/ postgres:9.6 -alpine
57
+ image : postgres:15 -alpine
58
58
env :
59
59
POSTGRES_USER : postgres
60
- POSTGRES_DB : circle_database
60
+ POSTGRES_DB : otel_pg_database
61
+ POSTGRES_PASSWORD : postgres
61
62
ports :
62
63
- 5432:5432
63
64
options : >-
99
100
MONGODB_HOST : 127.0.0.1
100
101
MONGODB_PORT : 27017
101
102
MSSQL_PASSWORD : mssql_passw0rd
102
- MYSQL_DATABASE : circle_database
103
+ MYSQL_DATABASE : otel_mysql_database
103
104
MYSQL_HOST : localhost
104
105
MYSQL_PASSWORD : secret
105
106
MYSQL_PORT : 3306
@@ -108,10 +109,11 @@ jobs:
108
109
OPENTELEMETRY_MEMCACHED_PORT : 11211
109
110
OPENTELEMETRY_REDIS_HOST : localhost
110
111
OPENTELEMETRY_REDIS_PORT : 6379
111
- POSTGRES_DB : circle_database
112
+ POSTGRES_DB : otel_pg_database
112
113
POSTGRES_HOST : localhost
113
114
POSTGRES_PORT : 5432
114
115
POSTGRES_USER : postgres
116
+ POSTGRES_PASSWORD : postgres
115
117
NPM_CONFIG_UNSAFE_PERM : true
116
118
steps :
117
119
- name : Checkout
Original file line number Diff line number Diff line change @@ -38,9 +38,9 @@ const dockerRunCmds = {
38
38
mssql :
39
39
'docker run --rm -d --name otel-mssql -p 1433:1433 -e SA_PASSWORD=mssql_passw0rd -e ACCEPT_EULA=Y mcr.microsoft.com/mssql/server:2017-latest' ,
40
40
mysql :
41
- 'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret circleci/ mysql:5.7' ,
41
+ 'docker run --rm -d --name otel-mysql -p 33306:3306 -e MYSQL_ROOT_PASSWORD=rootpw -e MYSQL_DATABASE=test_db -e MYSQL_USER=otel -e MYSQL_PASSWORD=secret mysql:5.7' ,
42
42
postgres :
43
- 'docker run --rm -d --name otel-postgres -p 54320:5432 -e POSTGRES_PASSWORD=postgres postgres:13 -alpine' ,
43
+ 'docker run --rm -d --name otel-postgres -p 54320:5432 -e POSTGRES_PASSWORD=postgres postgres:15 -alpine' ,
44
44
redis : 'docker run --rm -d --name otel-redis -p 63790:6379 redis:alpine' ,
45
45
} ;
46
46
Original file line number Diff line number Diff line change 1
- export MYSQL_DATABASE=circle_database
1
+ export MYSQL_DATABASE=otel_mysql_database
2
2
export MYSQL_HOST=mysql
3
3
export MYSQL_PASSWORD=secret
4
4
export MYSQL_PORT=3306
You can’t perform that action at this time.
0 commit comments