Skip to content

Commit c6b49f8

Browse files
codebotencodeboten
authored
Merge branch 'open-telemetry:main' into main
2 parents e77ea62 + 33d8632 commit c6b49f8

File tree

6 files changed

+255
-20
lines changed

6 files changed

+255
-20
lines changed

‎Makefile‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,29 @@ genpdata:
259259
$(GOCMD) run pdata/internal/cmd/pdatagen/main.go
260260
$(MAKE) fmt
261261

262+
# The source directory for configuration schema.
263+
OPENTELEMETRY_JSONSCHEMA_SRC_DIR=service/internal/proctelemetry/opentelememetry-configuration
264+
265+
# The SHA matching the current version of the configuration schema to use
266+
OPENTELEMETRY_JSONSCHEMA_VERSION=main
267+
268+
# Cleanup temporary directory
269+
genjsonschema-cleanup:
270+
rm -Rf ${OPENTELEMETRY_JSONSCHEMA_SRC_DIR}
271+
272+
# Generate structs for configuration from configuration schema
273+
genjsonschema: genjsonschema-cleanup $(GOJSONSCHEMA)
274+
mkdir -p ${OPENTELEMETRY_JSONSCHEMA_SRC_DIR}
275+
curl -sSL https://api.github.com/repos/open-telemetry/opentelemetry-configuration/tarball/${OPENTELEMETRY_JSONSCHEMA_VERSION} | tar xz --strip 1 -C ${OPENTELEMETRY_JSONSCHEMA_SRC_DIR}
276+
$(GOJSONSCHEMA) \
277+
--package telemetry \
278+
--tags mapstructure \
279+
--output ./service/telemetry/generated_config.go \
280+
--schema-package=https://opentelemetry.io/otelconfig/opentelemetry_configuration.json=github.com/open-telemetry/opentelemetry-collector/schema \
281+
${OPENTELEMETRY_JSONSCHEMA_SRC_DIR}/schema/opentelemetry_configuration.json
282+
$(MAKE) fmt
283+
$(MAKE) genjsonschema-cleanup
284+
262285
# Generate semantic convention constants. Requires a clone of the opentelemetry-specification repo
263286
gensemconv:
264287
@[ "${SPECPATH}" ] || ( echo ">> env var SPECPATH is not set"; exit 1 )

‎Makefile.Common‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@ TOOLS_MOD_REGEX := "\s+_\s+\".*\""
1515
TOOLS_PKG_NAMES := $(shell grep -E $(TOOLS_MOD_REGEX) < $(TOOLS_MOD_DIR)/tools.go | tr -d " _\"" | grep -vE '/v[0-9]+$$')
1616
TOOLS_BIN_NAMES := $(addprefix $(TOOLS_BIN_DIR)/, $(notdir $(shell echo $(TOOLS_PKG_NAMES))))
1717

18-
ADDLICENSE := $(TOOLS_BIN_DIR)/addlicense
19-
APIDIFF := $(TOOLS_BIN_DIR)/apidiff
20-
CHECKDOC := $(TOOLS_BIN_DIR)/checkdoc
21-
CHLOG := $(TOOLS_BIN_DIR)/chloggen
22-
CROSSLINK := $(TOOLS_BIN_DIR)/crosslink
23-
ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
24-
GOIMPORTS := $(TOOLS_BIN_DIR)/goimports
25-
GOVULNCHECK := $(TOOLS_BIN_DIR)/govulncheck
26-
LINT := $(TOOLS_BIN_DIR)/golangci-lint
27-
IMPI := $(TOOLS_BIN_DIR)/impi
28-
MISSPELL := $(TOOLS_BIN_DIR)/misspell
29-
MULTIMOD := $(TOOLS_BIN_DIR)/multimod
30-
PORTO := $(TOOLS_BIN_DIR)/porto
31-
YQ := $(TOOLS_BIN_DIR)/yq
18+
ADDLICENSE := $(TOOLS_BIN_DIR)/addlicense
19+
APIDIFF := $(TOOLS_BIN_DIR)/apidiff
20+
CHECKDOC := $(TOOLS_BIN_DIR)/checkdoc
21+
CHLOG := $(TOOLS_BIN_DIR)/chloggen
22+
CROSSLINK := $(TOOLS_BIN_DIR)/crosslink
23+
ENVSUBST := $(TOOLS_BIN_DIR)/envsubst
24+
GOIMPORTS := $(TOOLS_BIN_DIR)/goimports
25+
GOJSONSCHEMA := $(TOOLS_BIN_DIR)/gojsonschema
26+
GOVULNCHECK := $(TOOLS_BIN_DIR)/govulncheck
27+
LINT := $(TOOLS_BIN_DIR)/golangci-lint
28+
IMPI := $(TOOLS_BIN_DIR)/impi
29+
MISSPELL := $(TOOLS_BIN_DIR)/misspell
30+
MULTIMOD := $(TOOLS_BIN_DIR)/multimod
31+
PORTO := $(TOOLS_BIN_DIR)/porto
32+
YQ := $(TOOLS_BIN_DIR)/yq
3233

3334
GH := $(shell which gh)
3435

‎internal/tools/go.mod‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.19
44

55
require (
66
github.com/a8m/envsubst v1.4.2
7+
github.com/atombender/go-jsonschema v0.11.0
78
github.com/client9/misspell v0.3.4
89
github.com/golangci/golangci-lint v1.53.3
910
github.com/google/addlicense v1.1.1
@@ -15,7 +16,7 @@ require (
1516
go.opentelemetry.io/build-tools/crosslink v0.8.0
1617
go.opentelemetry.io/build-tools/multimod v0.8.0
1718
go.opentelemetry.io/build-tools/semconvgen v0.8.0
18-
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
19+
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
1920
golang.org/x/tools v0.10.0
2021
golang.org/x/vuln v0.1.0
2122
)
@@ -41,7 +42,6 @@ require (
4142
github.com/alingse/asasalint v0.0.11 // indirect
4243
github.com/ashanbrown/forbidigo v1.5.3 // indirect
4344
github.com/ashanbrown/makezero v1.1.1 // indirect
44-
github.com/benbjohnson/clock v1.3.0 // indirect
4545
github.com/beorn7/perks v1.0.1 // indirect
4646
github.com/bkielbasa/cyclop v1.2.1 // indirect
4747
github.com/blizzy78/varnamelen v0.8.0 // indirect
@@ -137,6 +137,7 @@ require (
137137
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
138138
github.com/mgechev/revive v1.3.2 // indirect
139139
github.com/mitchellh/go-homedir v1.1.0 // indirect
140+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
140141
github.com/mitchellh/mapstructure v1.5.0 // indirect
141142
github.com/moricho/tparallel v0.3.1 // indirect
142143
github.com/nakabonne/nestif v0.3.1 // indirect
@@ -147,6 +148,7 @@ require (
147148
github.com/olekukonko/tablewriter v0.0.5 // indirect
148149
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
149150
github.com/pjbgf/sha1cd v0.3.0 // indirect
151+
github.com/pkg/errors v0.9.1 // indirect
150152
github.com/pmezard/go-difflib v1.0.0 // indirect
151153
github.com/polyfloyd/go-errorlint v1.4.2 // indirect
152154
github.com/prometheus/client_golang v1.16.0 // indirect
@@ -159,6 +161,7 @@ require (
159161
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
160162
github.com/ryancurrah/gomodguard v1.3.0 // indirect
161163
github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
164+
github.com/sanity-io/litter v1.5.5 // indirect
162165
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
163166
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
164167
github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
@@ -229,3 +232,6 @@ retract (
229232
v0.57.1 // Release failed, use v0.57.2
230233
v0.57.0 // Release failed, use v0.57.2
231234
)
235+
236+
// work around until https://github.com/omissis/go-jsonschema/pull/80 is merged
237+
replace github.com/atombender/go-jsonschema v0.11.0 => github.com/codeboten/go-jsonschema v0.0.0-20230622190031-76e0cafc4ced

‎internal/tools/go.sum‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ github.com/ashanbrown/forbidigo v1.5.3 h1:jfg+fkm/snMx+V9FBwsl1d340BV/99kZGv5jN9
8989
github.com/ashanbrown/forbidigo v1.5.3/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU=
9090
github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s=
9191
github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI=
92-
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
93-
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
92+
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
9493
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
9594
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
9695
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -132,12 +131,15 @@ github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUK
132131
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
133132
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
134133
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
134+
github.com/codeboten/go-jsonschema v0.0.0-20230622190031-76e0cafc4ced h1:wZe0sCnIxs39oMjxSrZFZDq6ZPxByIcALMGk5nE5nvA=
135+
github.com/codeboten/go-jsonschema v0.0.0-20230622190031-76e0cafc4ced/go.mod h1:6WyhPNbz6H8M3IzlAd1DMENTh/QUHBYoFe8na6yl1FE=
135136
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
136137
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
137138
github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo=
138139
github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc=
139140
github.com/daixiang0/gci v0.10.1 h1:eheNA3ljF6SxnPD/vE4lCBusVHmV3Rs3dkKvFrJ7MR0=
140141
github.com/daixiang0/gci v0.10.1/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI=
142+
github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
141143
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
142144
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
143145
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -191,6 +193,9 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
191193
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
192194
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
193195
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
196+
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
197+
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
198+
github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
194199
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
195200
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
196201
github.com/go-toolsmith/astcast v1.1.0 h1:+JN9xZV1A+Re+95pgnMgDboWNVnIMMQXwfBwLRPgSC8=
@@ -396,6 +401,7 @@ github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUc
396401
github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0=
397402
github.com/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo=
398403
github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4=
404+
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
399405
github.com/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU=
400406
github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY=
401407
github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM=
@@ -429,6 +435,8 @@ github.com/mikefarah/yq/v4 v4.34.1 h1:7W+SZXvu1yOxpVXS7Hi5a34nU/gdYPjWMNQqoSlfbx
429435
github.com/mikefarah/yq/v4 v4.34.1/go.mod h1:B2JxXiGKqEaU+GTcNwOZ/RQFelq9e6TFIDLRVVFHAu4=
430436
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
431437
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
438+
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
439+
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
432440
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
433441
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
434442
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -473,6 +481,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
473481
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
474482
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
475483
github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
484+
github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
476485
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
477486
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
478487
github.com/polyfloyd/go-errorlint v1.4.2 h1:CU+O4181IxFDdPH6t/HT7IiDj1I7zxNi1RIUxYwn8d0=
@@ -518,6 +527,8 @@ github.com/ryancurrah/gomodguard v1.3.0 h1:q15RT/pd6UggBXVBuLps8BXRvl5GPBcwVA7BJ
518527
github.com/ryancurrah/gomodguard v1.3.0/go.mod h1:ggBxb3luypPEzqVtq33ee7YSN35V28XeGnid8dnni50=
519528
github.com/ryanrolds/sqlclosecheck v0.4.0 h1:i8SX60Rppc1wRuyQjMciLqIzV3xnoHB7/tXbr6RGYNI=
520529
github.com/ryanrolds/sqlclosecheck v0.4.0/go.mod h1:TBRRjzL31JONc9i4XMinicuo+s+E8yKZ5FN8X3G6CKQ=
530+
github.com/sanity-io/litter v1.5.5 h1:iE+sBxPBzoK6uaEP5Lt3fHNgpKcHXc/A2HGETy0uJQo=
531+
github.com/sanity-io/litter v1.5.5/go.mod h1:9gzJgR2i4ZpjZHsKvUXIRQVk7P+yM3e+jAF7bU2UI5U=
521532
github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc=
522533
github.com/sanposhiho/wastedassign/v2 v2.0.7/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
523534
github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw=
@@ -571,6 +582,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
571582
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
572583
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
573584
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
585+
github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
574586
github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
575587
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
576588
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -681,8 +693,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
681693
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
682694
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
683695
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
684-
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4=
685-
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
696+
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
697+
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
686698
golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
687699
golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
688700
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 h1:J74nGeMgeFnYQJN59eFwh06jX/V8g0lB7LWpjSLxtgU=

‎internal/tools/tools.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ package tools // import "go.opentelemetry.io/collector/internal/tools"
1313

1414
import (
1515
_ "github.com/a8m/envsubst/cmd/envsubst"
16+
_ "github.com/atombender/go-jsonschema/cmd/gojsonschema"
1617
_ "github.com/client9/misspell/cmd/misspell"
1718
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
1819
_ "github.com/google/addlicense"

0 commit comments

Comments
 (0)