diff --git a/.github/workflows/scripts/check-collector-module-version.sh b/.github/workflows/scripts/check-collector-module-version.sh index 60f47ec4d54ce..04cfc26b56c9b 100755 --- a/.github/workflows/scripts/check-collector-module-version.sh +++ b/.github/workflows/scripts/check-collector-module-version.sh @@ -18,6 +18,9 @@ # verifies if the collector components are using the main core collector version # as a dependency. # + +source ./internal/buildscripts/modules + set -eu -o pipefail # Return the collector main core version @@ -69,19 +72,29 @@ check_collector_versions_correct() { fi } +MAIN_MOD_FILE="./go.mod" + # Note space at end of string. This is so it filters for the exact string # only and does not return string which contains this string as a substring. -COLLECTOR_MODULE="go.opentelemetry.io/collector " -PDATA_MODULE="go.opentelemetry.io/collector/pdata " +BETA_MODULE="go.opentelemetry.io/collector " +BETA_MOD_VERSION=$(get_collector_version "$BETA_MODULE" "$MAIN_MOD_FILE") +check_collector_versions_correct "$BETA_MODULE" "$BETA_MOD_VERSION" +for mod in ${beta_modules[@]}; do + check_collector_versions_correct "$mod" "$BETA_MOD_VERSION" +done -MAIN_MOD_FILE="./go.mod" -COLLECTOR_MOD_VERSION=$(get_collector_version "$COLLECTOR_MODULE" "$MAIN_MOD_FILE") -PDATA_MOD_VERSION=$(get_collector_version "$PDATA_MODULE" "$MAIN_MOD_FILE") - -# Check the collector module version in each of the module files -check_collector_versions_correct "$COLLECTOR_MODULE" "$COLLECTOR_MOD_VERSION" -check_collector_versions_correct "go.opentelemetry.io/collector/component" "$COLLECTOR_MOD_VERSION" -check_collector_versions_correct "go.opentelemetry.io/collector/consumer" "$COLLECTOR_MOD_VERSION" -check_collector_versions_correct "go.opentelemetry.io/collector/featuregate" "$COLLECTOR_MOD_VERSION" -check_collector_versions_correct "go.opentelemetry.io/collector/pdata" "$PDATA_MOD_VERSION" -check_collector_versions_correct "go.opentelemetry.io/collector/semconv" "$COLLECTOR_MOD_VERSION" +# Check RC modules +RC_MODULE="go.opentelemetry.io/collector/pdata " +RC_MOD_VERSION=$(get_collector_version "$RC_MODULE" "$MAIN_MOD_FILE") +check_collector_versions_correct "$RC_MODULE" "$RC_MOD_VERSION" +for mod in ${rc_modules[@]}; do + check_collector_versions_correct "$mod" "$RC_MOD_VERSION" +done + +# Check stable modules, none currently exist, uncomment when pdata is 1.0.0 +# STABLE_MODULE="go.opentelemetry.io/collector/pdata " +# STABLE_MOD_VERSION=$(get_collector_version "$STABLE_MODULE" "$MAIN_MOD_FILE") +# check_collector_versions_correct "$STABLE_MODULE" "$STABLE_MOD_VERSION" +# for mod in ${stable_modules[@]}; do +# check_collector_versions_correct "$mod" "$STABLE_MOD_VERSION" +# done \ No newline at end of file diff --git a/Makefile.Common b/Makefile.Common index fcf30d05befa3..7a489d039d0c1 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -155,5 +155,5 @@ moddownload: .PHONY: updatedep updatedep: - $(PWD)/internal/buildscripts/update-dep + TOPDIR=$(PWD) $(PWD)/internal/buildscripts/update-dep @$(MAKE) tidy diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 50c8aca9ced50..8222950c1ca68 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -61,7 +61,7 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 3b7cdcb51d6a1..eccb28551ba5b 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -431,8 +431,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= diff --git a/exporter/parquetexporter/go.mod b/exporter/parquetexporter/go.mod index 755e3e070b59f..de1c025493e22 100644 --- a/exporter/parquetexporter/go.mod +++ b/exporter/parquetexporter/go.mod @@ -22,7 +22,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/otel v1.11.2 // indirect diff --git a/exporter/parquetexporter/go.sum b/exporter/parquetexporter/go.sum index e06d90defc635..0355e6af89715 100644 --- a/exporter/parquetexporter/go.sum +++ b/exporter/parquetexporter/go.sum @@ -282,8 +282,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 36e9c5d44f0e6..52250452458a0 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -35,7 +35,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect go.opentelemetry.io/otel v1.11.2 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index c7fd9adb8b1d3..eff380f3d4e8b 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -301,8 +301,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 1a3d3e54ddeb9..e8d0cb75b37d6 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -61,7 +61,7 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index a514a48a23886..1e8cd8e89599d 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -419,8 +419,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index d704fd48ce0e5..2b8fd6145943e 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -26,7 +26,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index 9186f51732233..96cb493d1ddf9 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -349,8 +349,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index 1e28b8c5724db..9e03131be7269 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index 937f63d2c367c..1320d1452b4ab 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -275,8 +275,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index 51bc65c473329..0d79d0d6e9a4d 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -32,7 +32,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.8.0 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 3c4f7d29efe26..e2236ba218707 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -283,8 +283,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/internal/buildscripts/modules b/internal/buildscripts/modules new file mode 100644 index 0000000000000..9f0950eea1779 --- /dev/null +++ b/internal/buildscripts/modules @@ -0,0 +1,24 @@ +#!/bin/bash + +beta_modules=( + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/exporter/loggingexporter" + "go.opentelemetry.io/collector/exporter/otlpexporter" + "go.opentelemetry.io/collector/exporter/otlphttpexporter" + "go.opentelemetry.io/collector/extension/ballastextension" + "go.opentelemetry.io/collector/extension/zpagesextension" + "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/processor/batchprocessor" + "go.opentelemetry.io/collector/processor/memorylimiterprocessor" + "go.opentelemetry.io/collector/receiver/otlpreceiver" + "go.opentelemetry.io/collector/semconv" +) + +rc_modules=( + "go.opentelemetry.io/collector/pdata" +) + +# No stable modules currently exist, add pdata here once 1.0.0 +stable_modules=() diff --git a/internal/buildscripts/update-dep b/internal/buildscripts/update-dep index a69ad3c9d9473..43a036ed164ef 100755 --- a/internal/buildscripts/update-dep +++ b/internal/buildscripts/update-dep @@ -2,31 +2,27 @@ # Updates MODULE inside go.mod if it is already present to version VERSION. +source $TOPDIR/internal/buildscripts/modules + set -e if grep -q "$MODULE " go.mod; then go get "$MODULE"@"$VERSION" fi -modules=( - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/exporter/loggingexporter" - "go.opentelemetry.io/collector/exporter/otlpexporter" - "go.opentelemetry.io/collector/exporter/otlphttpexporter" - "go.opentelemetry.io/collector/extension/ballastextension" - "go.opentelemetry.io/collector/extension/zpagesextension" - "go.opentelemetry.io/collector/featuregate" - "go.opentelemetry.io/collector/processor/batchprocessor" - "go.opentelemetry.io/collector/processor/memorylimiterprocessor" - "go.opentelemetry.io/collector/receiver/otlpreceiver" - "go.opentelemetry.io/collector/semconv" - "go.opentelemetry.io/collector/pdata" -) - # If MODULE is "go.opentelemetry.io/collector" need to update additional $modules as well if [ "$MODULE" == "go.opentelemetry.io/collector" ]; then - for mod in ${modules[@]}; do + for mod in ${beta_modules[@]}; do + if grep -q "$mod " go.mod; then + go get -d "$mod"@"$VERSION" + fi + done + for mod in ${rc_modules[@]}; do + if grep -q "$mod " go.mod; then + go get -d "$mod"@"$VERSION" + fi + done + for mod in ${stable_modules[@]}; do if grep -q "$mod " go.mod; then go get -d "$mod"@"$VERSION" fi diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 85612da889462..c5005ee32c0f9 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -23,7 +23,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index 47c139e39840c..e2da792d89a76 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -269,8 +269,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 7c67ba674788c..460a5dbeea799 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -29,7 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/otel v1.11.2 // indirect go.opentelemetry.io/otel/metric v0.34.0 // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 06391dca54664..13c2ee6948fe7 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -290,8 +290,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 6a0f6bd46209b..094cb42b838ab 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -31,7 +31,7 @@ require ( github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/otel v1.11.2 // indirect diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index dd07c68b76bb6..90b8834c26dfc 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -272,8 +272,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index abe13595be4a6..f01f9b396482f 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -25,7 +25,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/otel v1.11.2 // indirect go.opentelemetry.io/otel/metric v0.34.0 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index de5d4d98f9df5..10d4ef86e8cd3 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -259,8 +259,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 1a9532b185133..6b6ac27923e7c 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -63,7 +63,7 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/semconv v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/otel v1.11.2 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index 7b163202afb31..766114bac4e9c 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -378,8 +378,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 1bf38df05969b..64502e0dab458 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -30,7 +30,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/otel v1.11.2 // indirect go.opentelemetry.io/otel/metric v0.34.0 // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 3a273288c05f5..17292a5357378 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -288,8 +288,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod index 136df6c43ce1f..0f883c63a67bb 100644 --- a/processor/servicegraphprocessor/go.mod +++ b/processor/servicegraphprocessor/go.mod @@ -61,7 +61,7 @@ require ( github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.37.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.12.0 // indirect diff --git a/processor/servicegraphprocessor/go.sum b/processor/servicegraphprocessor/go.sum index 9b50d6320896d..c4cf6ca39d921 100644 --- a/processor/servicegraphprocessor/go.sum +++ b/processor/servicegraphprocessor/go.sum @@ -430,8 +430,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/exporter/otlpexporter v0.67.1-0.20221216200611-892d07dffbb8 h1:45mR0XvW1oS4nYA83nE4lZLr5KVTRXqA6ax7reiTy4Q= diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index c9c26ad6f76c2..ee2ee7ebc418e 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -72,7 +72,7 @@ require ( github.com/tklauser/numcpus v0.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/semconv v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.12.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 96cc796012dbf..ff1cf61bf66a9 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -467,8 +467,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/extension/zpagesextension v0.67.0 h1:TRW8vZwE+/h2vJqqMDmyQO9X0sxcYCSXf5MyXozSLas= diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index f7f7fd93cc9f3..ad609a90f1629 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -32,7 +32,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/rs/cors v1.8.2 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/pdata v1.0.0-rc1.0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.37.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 6872d51a7f4d2..a786441e1e5b5 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -295,8 +295,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw= diff --git a/testbed/go.mod b/testbed/go.mod index 4c532866fb621..19aa42bcfe6c8 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -19,7 +19,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.67.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.67.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.67.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.67.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.67.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.67.0 github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver v0.67.0 diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 903cb41a5fc08..73ac4f6594e93 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -24,7 +24,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml v1.9.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 // indirect + go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 // indirect go.opentelemetry.io/otel v1.11.2 // indirect go.opentelemetry.io/otel/metric v0.34.0 // indirect diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index cbd192395ce68..67e9e4ee5a3b6 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -282,8 +282,8 @@ go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8 h1:VcGnEQrjt go.opentelemetry.io/collector v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:Qn7kPOb6JCf4PpVt1c2dJdKS0uDC6T78Sqv3CDRuDbw= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8 h1:Y2bxtt7ImtqCGpWBx6opxiTmGztQGqCYjV3g/JraRN8= go.opentelemetry.io/collector/component v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:VbvZytUKFYeVzQCpuJ6jxAXl9Rwxz+7sJ8d6uuT1qmM= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3 h1:87+ue6MNDFqbCLo4WnIWxDL3yAOOa8XYa42dylQE64U= -go.opentelemetry.io/collector/confmap v0.67.1-0.20221216193913-557c077e3cc3/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8 h1:NY1ER0sguSg1WxcAd49hbIuMK1VQE8mQRwU15+qmL8g= +go.opentelemetry.io/collector/confmap v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:vE14PymmnYeZe+zoOxO5rXCy5BQ1AjUHpr/gDgLl6mw= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8 h1:1R8FOf1aKBpc2qHUHSGxQd1SrCB2oblsshzfjmtWffc= go.opentelemetry.io/collector/consumer v0.67.1-0.20221216200611-892d07dffbb8/go.mod h1:maReFNF5y1GcBAM1zBq3ukRg5caMRsoHAK4+5hN3wA0= go.opentelemetry.io/collector/featuregate v0.67.1-0.20221216200611-892d07dffbb8 h1:qNeng/2RFFa3k9d+xlohFOPcs6A2q6Fm0VbZe7NnTOw=