Skip to content

Commit 5467e39

Browse files
kaylareopellescbjans
authored andcommitted
chore: Fix release matching directories (open-telemetry#1728)
* chore: Fix release matching directories HTTP / HTTPX SQL / Sql Obfuscation + Sql Processors All these gems match on the substring and cause toys to initiate releases when changes have not been made to accidentally matching gems. Adding a / should fix the match problem. * Apply suggestions from code review Co-authored-by: Sander Jans <[email protected]> --------- Co-authored-by: Sander Jans <[email protected]>
1 parent 5ba87bd commit 5467e39

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

.toys/.data/releases.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ gems:
4343
version_constant: [OpenTelemetry, Instrumentation, ActiveStorage, VERSION]
4444

4545
- name: opentelemetry-helpers-sql
46-
directory: helpers/sql
46+
# we append a slash here to avoid the naive substring start_with? directory-matching condition in underlying toys gem
47+
# which causes helpers/sql to incorrectly match when changes occur in helpers/sql-processor or helpers/sql-obfuscation
48+
# https://github.com/dazuma/toys/blob/17ed449da8299f272b834470ff6b279a59e8070b/.toys/release/.lib/release_utils.rb#L436
49+
# https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/1727
50+
directory: helpers/sql/
4751
version_constant: [OpenTelemetry, Helpers, Sql, VERSION]
4852

4953
- name: opentelemetry-instrumentation-gruf
@@ -142,7 +146,11 @@ gems:
142146
version_constant: [OpenTelemetry, Instrumentation, LMDB, VERSION]
143147

144148
- name: opentelemetry-instrumentation-http
145-
directory: instrumentation/http
149+
# we append a slash here to avoid the naive substring start_with? directory-matching condition in underlying toys gem
150+
# which causes instrumentation/http to incorrectly match when changes occur in instrumentation/httpx
151+
# https://github.com/dazuma/toys/blob/17ed449da8299f272b834470ff6b279a59e8070b/.toys/release/.lib/release_utils.rb#L436
152+
# https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/1512
153+
directory: instrumentation/http/
146154
version_constant: [OpenTelemetry, Instrumentation, HTTP, VERSION]
147155

148156
- name: opentelemetry-instrumentation-graphql

0 commit comments

Comments
 (0)