Merge branch 'main' into revive-conf

open-telemetry · May 10, 2022 · 7c10a2c · 7c10a2c
2 parents 714131f + a0bed80
commit 7c10a2c
Show file tree

Hide file tree

Showing 39 changed files with 40 additions and 1,784 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+### Changed
+
+- The `crosslink` make target has been updated to use the `go.opentelemetry.io/build-tools/crosslink` package. (#2886)
+
 ## [1.7.0/0.30.0] - 2022-04-28
 
 ### Added

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -12,6 +12,6 @@
 #  https://help.github.com/en/articles/about-code-owners
 #
 
-* @jmacd @MrAlias @Aneurysm9 @evantorrie @XSAM @dashpole @paivagustavo @MadVikingGod @pellared @hanyuancheung
+* @jmacd @MrAlias @Aneurysm9 @evantorrie @XSAM @dashpole @MadVikingGod @pellared @hanyuancheung
 
 CODEOWNERS @MrAlias @Aneurysm9 @MadVikingGod
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -506,7 +506,6 @@ Approvers:
 - [Josh MacDonald](https://github.com/jmacd), LightStep
 - [Sam Xie](https://github.com/XSAM), Cisco/AppDynamics
 - [David Ashpole](https://github.com/dashpole), Google
-- [Gustavo Silva Paiva](https://github.com/paivagustavo), LightStep
 - [Robert Pająk](https://github.com/pellared), Splunk
 - [Chester Cheung](https://github.com/hanyuancheung), Tencent
 
@@ -516,6 +515,10 @@ Maintainers:
 - [Anthony Mirabella](https://github.com/Aneurysm9), AWS
 - [Tyler Yahn](https://github.com/MrAlias), Splunk
 
+Emeritus:
+
+- [Gustavo Silva Paiva](https://github.com/paivagustavo), LightStep
+
 ### Become an Approver or a Maintainer
 
 See the [community membership document in OpenTelemetry community

diff --git a/Makefile b/Makefile
@@ -45,7 +45,7 @@ SEMCONVGEN = $(TOOLS)/semconvgen
 $(TOOLS)/semconvgen: PACKAGE=go.opentelemetry.io/build-tools/semconvgen
 
 CROSSLINK = $(TOOLS)/crosslink
-$(TOOLS)/crosslink: PACKAGE=go.opentelemetry.io/otel/$(TOOLS_MOD_DIR)/crosslink
+$(TOOLS)/crosslink: PACKAGE=go.opentelemetry.io/build-tools/crosslink
 
 SEMCONVKIT = $(TOOLS)/semconvkit
 $(TOOLS)/semconvkit: PACKAGE=go.opentelemetry.io/otel/$(TOOLS_MOD_DIR)/semconvkit
@@ -147,8 +147,8 @@ golangci-lint/%: | $(GOLANGCI_LINT)
 
 .PHONY: crosslink
 crosslink: | $(CROSSLINK)
-	@echo "cross-linking all go modules" \
-		&& $(CROSSLINK)
+	@echo "Updating intra-repository dependencies in all go modules" \
+		&& $(CROSSLINK) --root=$(shell pwd) --prune
 
 .PHONY: go-mod-tidy
 go-mod-tidy: $(ALL_GO_MOD_DIRS:%=go-mod-tidy/%)

diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod
@@ -13,64 +13,10 @@ require (
 
 replace go.opentelemetry.io/otel => ../..
 
-replace go.opentelemetry.io/otel/bridge/opencensus => ./
-
-replace go.opentelemetry.io/otel/bridge/opentracing => ../opentracing
-
-replace go.opentelemetry.io/otel/example/jaeger => ../../example/jaeger
-
-replace go.opentelemetry.io/otel/example/namedtracer => ../../example/namedtracer
-
-replace go.opentelemetry.io/otel/example/opencensus => ../../example/opencensus
-
-replace go.opentelemetry.io/otel/example/otel-collector => ../../example/otel-collector
-
-replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus
-
-replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin
-
-replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus
-
-replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger
-
-replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin
-
-replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools
-
 replace go.opentelemetry.io/otel/sdk => ../../sdk
 
 replace go.opentelemetry.io/otel/metric => ../../metric
 
-replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric
-
 replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric
 
 replace go.opentelemetry.io/otel/trace => ../../trace
-
-replace go.opentelemetry.io/otel/example/passthrough => ../../example/passthrough
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../exporters/otlp/otlptrace
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../exporters/otlp/otlptrace/otlptracegrpc
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../exporters/otlp/otlptrace/otlptracehttp
-
-replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../exporters/otlp/otlpmetric
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../exporters/otlp/otlpmetric/otlpmetricgrpc
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../exporters/stdout/stdoutmetric
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../exporters/stdout/stdouttrace
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../exporters/otlp/otlpmetric/otlpmetrichttp
-
-replace go.opentelemetry.io/otel/bridge/opencensus/test => ./test
-
-replace go.opentelemetry.io/otel/example/fib => ../../example/fib
-
-replace go.opentelemetry.io/otel/schema => ../../schema
-
-replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../exporters/otlp/internal/retry
diff --git a/bridge/opencensus/test/go.mod b/bridge/opencensus/test/go.mod
@@ -14,62 +14,10 @@ replace go.opentelemetry.io/otel => ../../..
 
 replace go.opentelemetry.io/otel/bridge/opencensus => ../
 
-replace go.opentelemetry.io/otel/bridge/opencensus/test => ./
-
-replace go.opentelemetry.io/otel/bridge/opentracing => ../../opentracing
-
-replace go.opentelemetry.io/otel/example/jaeger => ../../../example/jaeger
-
-replace go.opentelemetry.io/otel/example/namedtracer => ../../../example/namedtracer
-
-replace go.opentelemetry.io/otel/example/opencensus => ../../../example/opencensus
-
-replace go.opentelemetry.io/otel/example/otel-collector => ../../../example/otel-collector
-
-replace go.opentelemetry.io/otel/example/passthrough => ../../../example/passthrough
-
-replace go.opentelemetry.io/otel/example/prometheus => ../../../example/prometheus
-
-replace go.opentelemetry.io/otel/example/zipkin => ../../../example/zipkin
-
-replace go.opentelemetry.io/otel/exporters/jaeger => ../../../exporters/jaeger
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../../exporters/otlp/otlpmetric
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../../exporters/otlp/otlpmetric/otlpmetricgrpc
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../../exporters/otlp/otlpmetric/otlpmetrichttp
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../../exporters/otlp/otlptrace
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../../exporters/otlp/otlptrace/otlptracegrpc
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../../exporters/otlp/otlptrace/otlptracehttp
-
-replace go.opentelemetry.io/otel/exporters/prometheus => ../../../exporters/prometheus
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../../exporters/stdout/stdoutmetric
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../../exporters/stdout/stdouttrace
-
-replace go.opentelemetry.io/otel/exporters/zipkin => ../../../exporters/zipkin
-
-replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric
-
-replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools
-
 replace go.opentelemetry.io/otel/metric => ../../../metric
 
 replace go.opentelemetry.io/otel/sdk => ../../../sdk
 
-replace go.opentelemetry.io/otel/sdk/export/metric => ../../../sdk/export/metric
-
 replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric
 
 replace go.opentelemetry.io/otel/trace => ../../../trace
-
-replace go.opentelemetry.io/otel/example/fib => ../../../example/fib
-
-replace go.opentelemetry.io/otel/schema => ../../../schema
-
-replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../../exporters/otlp/internal/retry
diff --git a/bridge/opentracing/go.mod b/bridge/opentracing/go.mod
@@ -10,64 +10,4 @@ require (
 	go.opentelemetry.io/otel/trace v1.7.0
 )
 
-replace go.opentelemetry.io/otel/bridge/opencensus => ../opencensus
-
-replace go.opentelemetry.io/otel/bridge/opentracing => ./
-
-replace go.opentelemetry.io/otel/example/jaeger => ../../example/jaeger
-
-replace go.opentelemetry.io/otel/example/namedtracer => ../../example/namedtracer
-
-replace go.opentelemetry.io/otel/example/opencensus => ../../example/opencensus
-
-replace go.opentelemetry.io/otel/example/otel-collector => ../../example/otel-collector
-
-replace go.opentelemetry.io/otel/example/prometheus => ../../example/prometheus
-
-replace go.opentelemetry.io/otel/example/zipkin => ../../example/zipkin
-
-replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus
-
-replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger
-
-replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin
-
-replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools
-
-replace go.opentelemetry.io/otel/sdk => ../../sdk
-
-replace go.opentelemetry.io/otel/metric => ../../metric
-
-replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric
-
-replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric
-
 replace go.opentelemetry.io/otel/trace => ../../trace
-
-replace go.opentelemetry.io/otel/example/passthrough => ../../example/passthrough
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../exporters/otlp/otlptrace
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../exporters/otlp/otlptrace/otlptracegrpc
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../exporters/otlp/otlptrace/otlptracehttp
-
-replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../exporters/otlp/otlpmetric
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../exporters/otlp/otlpmetric/otlpmetricgrpc
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../exporters/stdout/stdoutmetric
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../exporters/stdout/stdouttrace
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../exporters/otlp/otlpmetric/otlpmetrichttp
-
-replace go.opentelemetry.io/otel/bridge/opencensus/test => ../opencensus/test
-
-replace go.opentelemetry.io/otel/example/fib => ../../example/fib
-
-replace go.opentelemetry.io/otel/schema => ../../schema
-
-replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../exporters/otlp/internal/retry
diff --git a/example/fib/go.mod b/example/fib/go.mod
@@ -11,64 +11,8 @@ require (
 
 replace go.opentelemetry.io/otel => ../..
 
-replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus
-
-replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../bridge/opencensus/test
-
-replace go.opentelemetry.io/otel/bridge/opentracing => ../../bridge/opentracing
-
-replace go.opentelemetry.io/otel/example/jaeger => ../jaeger
-
-replace go.opentelemetry.io/otel/example/namedtracer => ../namedtracer
-
-replace go.opentelemetry.io/otel/example/opencensus => ../opencensus
-
-replace go.opentelemetry.io/otel/example/otel-collector => ../otel-collector
-
-replace go.opentelemetry.io/otel/example/passthrough => ../passthrough
-
-replace go.opentelemetry.io/otel/example/prometheus => ../prometheus
-
-replace go.opentelemetry.io/otel/example/zipkin => ../zipkin
-
-replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../exporters/otlp/otlpmetric
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../exporters/otlp/otlpmetric/otlpmetricgrpc
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../exporters/otlp/otlpmetric/otlpmetrichttp
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../exporters/otlp/otlptrace
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../exporters/otlp/otlptrace/otlptracegrpc
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../exporters/otlp/otlptrace/otlptracehttp
-
-replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../exporters/stdout/stdoutmetric
-
 replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../exporters/stdout/stdouttrace
 
-replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin
-
-replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric
-
-replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools
-
-replace go.opentelemetry.io/otel/metric => ../../metric
-
 replace go.opentelemetry.io/otel/sdk => ../../sdk
 
-replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric
-
-replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric
-
 replace go.opentelemetry.io/otel/trace => ../../trace
-
-replace go.opentelemetry.io/otel/example/fib => ./
-
-replace go.opentelemetry.io/otel/schema => ../../schema
-
-replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../exporters/otlp/internal/retry
diff --git a/example/jaeger/go.mod b/example/jaeger/go.mod
@@ -14,60 +14,4 @@ require (
 	go.opentelemetry.io/otel/sdk v1.7.0
 )
 
-replace go.opentelemetry.io/otel/bridge/opencensus => ../../bridge/opencensus
-
-replace go.opentelemetry.io/otel/bridge/opentracing => ../../bridge/opentracing
-
-replace go.opentelemetry.io/otel/example/jaeger => ./
-
-replace go.opentelemetry.io/otel/example/namedtracer => ../namedtracer
-
-replace go.opentelemetry.io/otel/example/opencensus => ../opencensus
-
-replace go.opentelemetry.io/otel/example/otel-collector => ../otel-collector
-
-replace go.opentelemetry.io/otel/example/prometheus => ../prometheus
-
-replace go.opentelemetry.io/otel/example/zipkin => ../zipkin
-
-replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus
-
-replace go.opentelemetry.io/otel/exporters/zipkin => ../../exporters/zipkin
-
-replace go.opentelemetry.io/otel/internal/tools => ../../internal/tools
-
-replace go.opentelemetry.io/otel/metric => ../../metric
-
-replace go.opentelemetry.io/otel/sdk/export/metric => ../../sdk/export/metric
-
-replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric
-
 replace go.opentelemetry.io/otel/trace => ../../trace
-
-replace go.opentelemetry.io/otel/example/passthrough => ../passthrough
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../exporters/otlp/otlptrace
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../exporters/otlp/otlptrace/otlptracegrpc
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../exporters/otlp/otlptrace/otlptracehttp
-
-replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../exporters/otlp/otlpmetric
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../exporters/otlp/otlpmetric/otlpmetricgrpc
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../exporters/stdout/stdoutmetric
-
-replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../exporters/stdout/stdouttrace
-
-replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../exporters/otlp/otlpmetric/otlpmetrichttp
-
-replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../bridge/opencensus/test
-
-replace go.opentelemetry.io/otel/example/fib => ../fib
-
-replace go.opentelemetry.io/otel/schema => ../../schema
-
-replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../exporters/otlp/internal/retry