From f8e6da6a6bdbe45525a594c77c7167f80e82430d Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 11:55:50 -0700 Subject: [PATCH 01/10] Add crosslink build tool to makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8cd7eea76b3..72a23f7bddc 100644 --- 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 @@ -148,7 +148,7 @@ golangci-lint/%: | $(GOLANGCI_LINT) .PHONY: crosslink crosslink: | $(CROSSLINK) @echo "cross-linking all go modules" \ - && $(CROSSLINK) + && @$(CROSSLINK) --root=$(shell pwd) .PHONY: go-mod-tidy go-mod-tidy: $(ALL_GO_MOD_DIRS:%=go-mod-tidy/%) From 0ea7faa44b1733811f9e990ed0ecd7e911f2877c Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 11:56:05 -0700 Subject: [PATCH 02/10] Execute crosslink prune --- bridge/opencensus/go.mod | 54 +++++++-------- bridge/opencensus/test/go.mod | 52 +++++++-------- bridge/opentracing/go.mod | 60 ++++++++--------- example/fib/go.mod | 56 ++++++++-------- example/jaeger/go.mod | 56 ++++++++-------- example/namedtracer/go.mod | 56 ++++++++-------- example/opencensus/go.mod | 48 +++++++------- example/otel-collector/go.mod | 52 +++++++-------- example/passthrough/go.mod | 58 ++++++++-------- example/prometheus/go.mod | 52 +++++++-------- example/zipkin/go.mod | 56 ++++++++-------- exporters/jaeger/go.mod | 58 ++++++++-------- exporters/otlp/internal/retry/go.mod | 64 +++++++++--------- exporters/otlp/otlpmetric/go.mod | 52 +++++++-------- .../otlp/otlpmetric/otlpmetricgrpc/go.mod | 50 +++++++------- .../otlp/otlpmetric/otlpmetrichttp/go.mod | 50 +++++++------- exporters/otlp/otlptrace/go.mod | 56 ++++++++-------- exporters/otlp/otlptrace/otlptracegrpc/go.mod | 54 +++++++-------- exporters/otlp/otlptrace/otlptracehttp/go.mod | 54 +++++++-------- exporters/prometheus/go.mod | 54 +++++++-------- exporters/stdout/stdoutmetric/go.mod | 54 +++++++-------- exporters/stdout/stdouttrace/go.mod | 58 ++++++++-------- exporters/zipkin/go.mod | 58 ++++++++-------- go.mod | 62 ++++++++--------- internal/tools/go.mod | 66 +++++++++---------- metric/go.mod | 58 ++++++++-------- schema/go.mod | 64 +++++++++--------- sdk/go.mod | 60 ++++++++--------- sdk/metric/go.mod | 54 +++++++-------- trace/go.mod | 62 ++++++++--------- 30 files changed, 844 insertions(+), 844 deletions(-) diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod index 8acc612e542..88d652ccf82 100644 --- a/bridge/opencensus/go.mod +++ b/bridge/opencensus/go.mod @@ -13,64 +13,64 @@ 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 index 7ac137e1291..376aed14150 100644 --- a/bridge/opencensus/test/go.mod +++ b/bridge/opencensus/test/go.mod @@ -14,62 +14,62 @@ 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 index 58504ffe18d..15fc08c33b9 100644 --- a/bridge/opentracing/go.mod +++ b/bridge/opentracing/go.mod @@ -10,64 +10,64 @@ 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 index 579478f06b5..02e5c4a7a39 100644 --- a/example/fib/go.mod +++ b/example/fib/go.mod @@ -11,64 +11,64 @@ 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 index a3aa6e7a2c9..b36e6d51f3b 100644 --- a/example/jaeger/go.mod +++ b/example/jaeger/go.mod @@ -14,60 +14,60 @@ 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 + + + + + + + + + + + + + + diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod index 2e7fbe73c1a..3007319a362 100644 --- a/example/namedtracer/go.mod +++ b/example/namedtracer/go.mod @@ -15,62 +15,62 @@ require ( go.opentelemetry.io/otel/trace 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 => ../jaeger -replace go.opentelemetry.io/otel/example/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/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/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 + + + + + diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod index d595ae6a99b..2f91e0b57fe 100644 --- a/example/opencensus/go.mod +++ b/example/opencensus/go.mod @@ -18,60 +18,60 @@ require ( go.opentelemetry.io/otel/sdk/metric v0.30.0 ) -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 => ./ -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/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/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 + + + + + diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod index 3c6f108a3dd..823de3b6c64 100644 --- a/example/otel-collector/go.mod +++ b/example/otel-collector/go.mod @@ -15,62 +15,62 @@ require ( google.golang.org/grpc v1.46.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 => ../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 => ./ -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/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/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 diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod index 09df93d9fd3..c3ed46e313a 100644 --- a/example/passthrough/go.mod +++ b/example/passthrough/go.mod @@ -15,62 +15,62 @@ replace ( go.opentelemetry.io/otel/trace => ../../trace ) -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 => ../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 => ./ -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/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/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/sdk/trace => ../../sdk/trace -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 + + + + + diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod index 0a4d2c1236c..248b6b23283 100644 --- a/example/prometheus/go.mod +++ b/example/prometheus/go.mod @@ -15,60 +15,60 @@ require ( go.opentelemetry.io/otel/sdk/metric v0.30.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 => ../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 => ./ -replace go.opentelemetry.io/otel/example/zipkin => ../zipkin -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/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 + + + + + + + + + + + + + + diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod index d11b2597ea5..76de0c3c473 100644 --- a/example/zipkin/go.mod +++ b/example/zipkin/go.mod @@ -15,60 +15,60 @@ require ( go.opentelemetry.io/otel/trace 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 => ../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 => ./ -replace go.opentelemetry.io/otel/exporters/prometheus => ../../exporters/prometheus -replace go.opentelemetry.io/otel/exporters/jaeger => ../../exporters/jaeger -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 + + + + + + + + + + + + + + diff --git a/exporters/jaeger/go.mod b/exporters/jaeger/go.mod index ffacb71f606..5364d02ff7a 100644 --- a/exporters/jaeger/go.mod +++ b/exporters/jaeger/go.mod @@ -10,66 +10,66 @@ require ( go.opentelemetry.io/otel/trace 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 => ../../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 => ../prometheus -replace go.opentelemetry.io/otel/exporters/jaeger => ./ -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 => ../../example/passthrough -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../otlp/otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../otlp/otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../otlp/otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric + + + + + replace go.opentelemetry.io/otel => ../.. -replace go.opentelemetry.io/otel/exporters/zipkin => ../zipkin + replace go.opentelemetry.io/otel/sdk => ../../sdk -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../otlp/otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../otlp/otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../otlp/otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../bridge/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 => ../otlp/internal/retry + + + + + + + + + diff --git a/exporters/otlp/internal/retry/go.mod b/exporters/otlp/internal/retry/go.mod index 8263d50146f..5c3f5dede63 100644 --- a/exporters/otlp/internal/retry/go.mod +++ b/exporters/otlp/internal/retry/go.mod @@ -7,66 +7,66 @@ require ( github.com/stretchr/testify v1.7.1 ) -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/fib => ../../../../example/fib -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 => ../../../jaeger -replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ./ -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/exporters/prometheus => ../../../prometheus -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/zipkin => ../../../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/schema => ../../../../schema -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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/exporters/otlp/otlpmetric/go.mod b/exporters/otlp/otlpmetric/go.mod index bf5598dfb88..3799bb6aa08 100644 --- a/exporters/otlp/otlpmetric/go.mod +++ b/exporters/otlp/otlpmetric/go.mod @@ -23,58 +23,58 @@ replace go.opentelemetry.io/otel/metric => ../../../metric replace go.opentelemetry.io/otel/trace => ../../../trace -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/bridge/opencensus => ../../../bridge/opencensus -replace go.opentelemetry.io/otel/bridge/opentracing => ../../../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/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/otlp/internal/retry => ../internal/retry -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ./ -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ./otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools -replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric -replace go.opentelemetry.io/otel/exporters/jaeger => ../../jaeger -replace go.opentelemetry.io/otel/exporters/prometheus => ../../prometheus -replace go.opentelemetry.io/otel/exporters/zipkin => ../../zipkin -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ./otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../bridge/opencensus/test -replace go.opentelemetry.io/otel/example/fib => ../../../example/fib -replace go.opentelemetry.io/otel/schema => ../../../schema + + + + + + + + + + + + + + + + diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod index 9cb6acc30db..2bac7ccafdb 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod @@ -28,54 +28,54 @@ replace go.opentelemetry.io/otel/metric => ../../../../metric replace go.opentelemetry.io/otel/trace => ../../../../trace -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 => ../../../../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/otlp/otlpmetric/otlpmetricgrpc => ./ -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/internal/tools => ../../../../internal/tools -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../../sdk/export/metric -replace go.opentelemetry.io/otel/internal/metric => ../../../../internal/metric -replace go.opentelemetry.io/otel/exporters/jaeger => ../../../jaeger -replace go.opentelemetry.io/otel/exporters/prometheus => ../../../prometheus -replace go.opentelemetry.io/otel/exporters/zipkin => ../../../zipkin -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../../bridge/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 => ../../internal/retry diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod index 7515cc11d9a..2b453c93103 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod @@ -23,54 +23,54 @@ replace go.opentelemetry.io/otel/metric => ../../../../metric replace go.opentelemetry.io/otel/trace => ../../../../trace -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 => ../../../../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/otlp/otlpmetric/otlpmetrichttp => ./ -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/internal/tools => ../../../../internal/tools -replace go.opentelemetry.io/otel/sdk/export/metric => ../../../../sdk/export/metric -replace go.opentelemetry.io/otel/internal/metric => ../../../../internal/metric -replace go.opentelemetry.io/otel/exporters/jaeger => ../../../jaeger -replace go.opentelemetry.io/otel/exporters/prometheus => ../../../prometheus -replace go.opentelemetry.io/otel/exporters/zipkin => ../../../zipkin -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../otlpmetricgrpc -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../../bridge/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 => ../../internal/retry diff --git a/exporters/otlp/otlptrace/go.mod b/exporters/otlp/otlptrace/go.mod index 4b78fd4bbe1..f6afbb8e3fe 100644 --- a/exporters/otlp/otlptrace/go.mod +++ b/exporters/otlp/otlptrace/go.mod @@ -18,62 +18,62 @@ replace go.opentelemetry.io/otel => ../../.. replace go.opentelemetry.io/otel/sdk => ../../../sdk -replace go.opentelemetry.io/otel/metric => ../../../metric + replace go.opentelemetry.io/otel/trace => ../../../trace -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 => ../../../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 => ../../prometheus -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ./ -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ./otlptracegrpc -replace go.opentelemetry.io/otel/exporters/jaeger => ../../jaeger -replace go.opentelemetry.io/otel/exporters/zipkin => ../../zipkin -replace go.opentelemetry.io/otel/internal/tools => ../../../internal/tools -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/example/passthrough => ../../../example/passthrough -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ./otlptracehttp -replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../bridge/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 => ../internal/retry diff --git a/exporters/otlp/otlptrace/otlptracegrpc/go.mod b/exporters/otlp/otlptrace/otlptracegrpc/go.mod index 2a760b0320f..97835eeb0c5 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/go.mod +++ b/exporters/otlp/otlptrace/otlptracegrpc/go.mod @@ -21,60 +21,60 @@ replace go.opentelemetry.io/otel/sdk => ../../../../sdk replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../ -replace go.opentelemetry.io/otel/metric => ../../../../metric + replace go.opentelemetry.io/otel/trace => ../../../../trace -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 => ../../../../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 => ../../../prometheus -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ./ -replace go.opentelemetry.io/otel/exporters/jaeger => ../../../jaeger -replace go.opentelemetry.io/otel/exporters/zipkin => ../../../zipkin -replace go.opentelemetry.io/otel/internal/tools => ../../../../internal/tools -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/example/passthrough => ../../../../example/passthrough -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../otlptracehttp -replace go.opentelemetry.io/otel/internal/metric => ../../../../internal/metric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../../bridge/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 => ../../internal/retry diff --git a/exporters/otlp/otlptrace/otlptracehttp/go.mod b/exporters/otlp/otlptrace/otlptracehttp/go.mod index a49ca02e574..267f277ce86 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/go.mod +++ b/exporters/otlp/otlptrace/otlptracehttp/go.mod @@ -17,62 +17,62 @@ replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../ replace go.opentelemetry.io/otel => ../../../.. -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 => ../../../../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/prometheus => ../../../prometheus -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ./ -replace go.opentelemetry.io/otel/exporters/jaeger => ../../../jaeger -replace go.opentelemetry.io/otel/exporters/zipkin => ../../../zipkin -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/internal/metric => ../../../../internal/metric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../../bridge/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 => ../../internal/retry diff --git a/exporters/prometheus/go.mod b/exporters/prometheus/go.mod index bdd037be053..627b13f8d72 100644 --- a/exporters/prometheus/go.mod +++ b/exporters/prometheus/go.mod @@ -13,64 +13,64 @@ require ( replace go.opentelemetry.io/otel => ../.. -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 => ../../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/otlp/otlptrace => ../otlp/otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../otlp/otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../otlp/otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/exporters/prometheus => ./ -replace go.opentelemetry.io/otel/exporters/jaeger => ../jaeger -replace go.opentelemetry.io/otel/exporters/zipkin => ../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/exporters/otlp/otlpmetric => ../otlp/otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../otlp/otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../otlp/otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../bridge/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 => ../otlp/internal/retry + + + + + + + + + diff --git a/exporters/stdout/stdoutmetric/go.mod b/exporters/stdout/stdoutmetric/go.mod index 3902d39bc3a..091b2a6174a 100644 --- a/exporters/stdout/stdoutmetric/go.mod +++ b/exporters/stdout/stdoutmetric/go.mod @@ -15,62 +15,62 @@ require ( go.opentelemetry.io/otel/sdk/metric v0.30.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 => ../../../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 => ../../prometheus -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ./ -replace go.opentelemetry.io/otel/exporters/jaeger => ../../jaeger -replace go.opentelemetry.io/otel/exporters/zipkin => ../../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 => ../../../example/passthrough -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../otlp/otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../otlp/otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../otlp/otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../otlp/otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../otlp/otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../otlp/otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../bridge/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 => ../../otlp/internal/retry + + + + + + + + + + + + + diff --git a/exporters/stdout/stdouttrace/go.mod b/exporters/stdout/stdouttrace/go.mod index 586949a1157..0e895b055db 100644 --- a/exporters/stdout/stdouttrace/go.mod +++ b/exporters/stdout/stdouttrace/go.mod @@ -14,62 +14,62 @@ require ( go.opentelemetry.io/otel/trace 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 => ../../../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 => ../../prometheus -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ./ -replace go.opentelemetry.io/otel/exporters/jaeger => ../../jaeger -replace go.opentelemetry.io/otel/exporters/zipkin => ../../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 => ../../../example/passthrough -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../../otlp/otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../../otlp/otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../../otlp/otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/internal/metric => ../../../internal/metric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../../otlp/otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../../otlp/otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../stdoutmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../../otlp/otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../../bridge/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 => ../../otlp/internal/retry + + + + + + + + + + + + + diff --git a/exporters/zipkin/go.mod b/exporters/zipkin/go.mod index 0a2de40baf9..2aca9272b8e 100644 --- a/exporters/zipkin/go.mod +++ b/exporters/zipkin/go.mod @@ -11,66 +11,66 @@ require ( go.opentelemetry.io/otel/trace 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 => ../../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 => ../prometheus -replace go.opentelemetry.io/otel/exporters/jaeger => ../jaeger -replace go.opentelemetry.io/otel/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 => ../../example/passthrough -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../otlp/otlptrace -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => ../otlp/otlptrace/otlptracegrpc -replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => ../otlp/otlptrace/otlptracehttp -replace go.opentelemetry.io/otel/internal/metric => ../../internal/metric + + + + + replace go.opentelemetry.io/otel => ../.. replace go.opentelemetry.io/otel/sdk => ../../sdk -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric => ../otlp/otlpmetric -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc => ../otlp/otlpmetric/otlpmetricgrpc -replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../stdout/stdoutmetric -replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../stdout/stdouttrace -replace go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp => ../otlp/otlpmetric/otlpmetrichttp -replace go.opentelemetry.io/otel/bridge/opencensus/test => ../../bridge/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 => ../otlp/internal/retry + + + + + + + + + diff --git a/go.mod b/go.mod index be9574814c4..7f74f1ff0f8 100644 --- a/go.mod +++ b/go.mod @@ -10,66 +10,66 @@ require ( go.opentelemetry.io/otel/trace v1.7.0 ) -replace go.opentelemetry.io/otel => ./ -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 => ./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/internal/metric => ./internal/metric -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/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 => ./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/internal/tools/go.mod b/internal/tools/go.mod index 62fa28a541e..41fa3c605c2 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -16,68 +16,68 @@ require ( golang.org/x/tools v0.1.10 ) -replace go.opentelemetry.io/otel => ../.. -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 => ../../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/prom-collector => ../../example/prom-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 => ./ -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 => ../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 => ../../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/metric/go.mod b/metric/go.mod index 02e82e3601f..5ccf0a0c327 100644 --- a/metric/go.mod +++ b/metric/go.mod @@ -9,62 +9,62 @@ require ( replace go.opentelemetry.io/otel => ../ -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 => ../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/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/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/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 => ../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/schema/go.mod b/schema/go.mod index bd5888f698d..8751250531e 100644 --- a/schema/go.mod +++ b/schema/go.mod @@ -8,66 +8,66 @@ require ( gopkg.in/yaml.v2 v2.4.0 ) -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/fib => ../example/fib -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/schema => ./ -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/exporters/otlp/internal/retry => ../exporters/otlp/internal/retry + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdk/go.mod b/sdk/go.mod index 99d1ddc815b..379c263defb 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -13,64 +13,64 @@ require ( golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 ) -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 => ../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 => ./ -replace go.opentelemetry.io/otel/metric => ../metric -replace go.opentelemetry.io/otel/sdk/export/metric => ./export/metric -replace go.opentelemetry.io/otel/sdk/metric => ./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 => ../bridge/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/sdk/metric/go.mod b/sdk/metric/go.mod index f81c840dfc0..103f1f89f72 100644 --- a/sdk/metric/go.mod +++ b/sdk/metric/go.mod @@ -4,37 +4,37 @@ go 1.16 replace go.opentelemetry.io/otel => ../.. -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 => ../../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/metric => ../../metric replace go.opentelemetry.io/otel/sdk => ../ -replace go.opentelemetry.io/otel/sdk/export/metric => ../export/metric -replace go.opentelemetry.io/otel/sdk/metric => ./ + + replace go.opentelemetry.io/otel/trace => ../../trace @@ -46,28 +46,28 @@ require ( go.opentelemetry.io/otel/sdk v1.7.0 ) -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/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 => ../../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/trace/go.mod b/trace/go.mod index 33c7efa1de5..1ba602356aa 100644 --- a/trace/go.mod +++ b/trace/go.mod @@ -4,39 +4,39 @@ go 1.16 replace go.opentelemetry.io/otel => ../ -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 => ../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/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 => ./ + + + + + + + + + + + + + + + + + require ( github.com/google/go-cmp v0.5.8 @@ -44,30 +44,30 @@ require ( go.opentelemetry.io/otel v1.7.0 ) -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 => ../bridge/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 + + + + + + + + + + + + + + From 5de2ffe156a251e21be8bf8f509846a41ef05670 Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 12:00:20 -0700 Subject: [PATCH 03/10] Remove internal crosslink tool --- internal/tools/crosslink/crosslink.go | 88 --------------------------- 1 file changed, 88 deletions(-) delete mode 100644 internal/tools/crosslink/crosslink.go diff --git a/internal/tools/crosslink/crosslink.go b/internal/tools/crosslink/crosslink.go deleted file mode 100644 index 5f19d5b946e..00000000000 --- a/internal/tools/crosslink/crosslink.go +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// The crosslink tool generates and maintains replace directives in all -// the go.mod files within this repository. Some directives are superfluous -// (e.g. because the replaced module doesn't occur in the dependency tree), -// but we generate them anyway for the sake of consistency (#1529 tracks -// pruning this to a mininal set). -// -// In particular, we generate a replace directive from each module to itself -// (i.e., the target path "./"). This is actually necessary in the presence of -// cyclic dependencies between modules. - -package main - -import ( - "log" - "os" - "path/filepath" - "strings" - - "go.opentelemetry.io/otel/internal/tools" - "golang.org/x/mod/modfile" -) - -func crossLink(m []*modfile.File) error { - for _, from := range m { - basepath := filepath.Dir(from.Syntax.Name) - for _, to := range m { - newPath, err := filepath.Rel(basepath, filepath.Dir(to.Syntax.Name)) - if err != nil { - return err - } - switch { - case newPath == ".", newPath == "..": - newPath += "/" - case !strings.HasPrefix(newPath, ".."): - newPath = "./" + newPath - } - from.AddReplace(to.Module.Mod.Path, "", newPath, "") - } - - from.Cleanup() - - f, err := os.OpenFile(from.Syntax.Name, os.O_RDWR|os.O_TRUNC, 0755) - if err != nil { - return err - } - if _, err = f.Write(modfile.Format(from.Syntax)); err != nil { - return err - } - if err = f.Close(); err != nil { - return err - } - } - return nil -} - -func main() { - root, err := tools.FindRepoRoot() - if err != nil { - log.Fatalf("unable to find repo root: %v", err) - } - - mods, err := root.FindModules() - if err != nil { - log.Fatalf("unable to list modules: %v", err) - } - - if err := tools.PrintModFiles(os.Stdout, mods); err != nil { - log.Fatalf("unable to print modules: %v", err) - } - - if err := crossLink(mods); err != nil { - log.Fatalf("unable to crosslink: %v", err) - } -} From 2331dd583ae629ca2b171efa4514d2dd4f696080 Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 12:01:01 -0700 Subject: [PATCH 04/10] Add go-build-tools crosslink --- internal/tools/go.mod | 67 +---------------------------------------- internal/tools/go.sum | 23 ++++++++++++-- internal/tools/tools.go | 1 + 3 files changed, 22 insertions(+), 69 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 41fa3c605c2..8821a9cb5a2 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -9,75 +9,10 @@ require ( github.com/itchyny/gojq v0.12.7 github.com/jcchavezs/porto v0.4.0 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad + go.opentelemetry.io/build-tools/crosslink v0.0.0-20220502161954-e2bf744925c0 go.opentelemetry.io/build-tools/dbotconf v0.0.0-20220321164008-b8e03aff061a go.opentelemetry.io/build-tools/multimod v0.0.0-20210920164323-2ceabab23375 go.opentelemetry.io/build-tools/semconvgen v0.0.0-20210920164323-2ceabab23375 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 golang.org/x/tools v0.1.10 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 07d8237bb28..59ec1d3b032 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -110,6 +110,8 @@ github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvx github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -346,8 +348,9 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -663,12 +666,15 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= +github.com/otiai10/copy v1.7.0 h1:hVoPiN+t+7d2nzzwMiDHPSOogsWAStewq3TwU05+clE= +github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= +github.com/otiai10/mint v1.3.3 h1:7JgpsBaN0uMkyju4tbYHu0mnM55hNKVYLsXmwr15NQI= +github.com/otiai10/mint v1.3.3/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -899,8 +905,11 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/build-tools v0.0.0-20210719163622-92017e64f35b/go.mod h1:zZRrJN8qdwDdPNkCEyww4SW54mM1Da0v9H3TyQet9T4= -go.opentelemetry.io/build-tools v0.0.0-20220304161722-feb5ff5848f1 h1:R/LC1WK1TDCbS2ANSeI2XcKrO5Ym6tx1YCUo+AaiFoE= go.opentelemetry.io/build-tools v0.0.0-20220304161722-feb5ff5848f1/go.mod h1:qO4vrNgLf0V5FHckLNwEw2CfBTaL8w6pKDm3bF6nhMk= +go.opentelemetry.io/build-tools v0.0.0-20220321164008-b8e03aff061a h1:yLxbGYl9MXOqD0o3unX/nJn+y+1loFNWZJWkfeguYV8= +go.opentelemetry.io/build-tools v0.0.0-20220321164008-b8e03aff061a/go.mod h1:gkLviEngQuoeD670EP1KA/Oj4i5oNAzb+pjkk+4ecaQ= +go.opentelemetry.io/build-tools/crosslink v0.0.0-20220502161954-e2bf744925c0 h1:yumJiwLmJ3xQXgvhywkGqkhbh9hbTsAWEuCGoRJi8bQ= +go.opentelemetry.io/build-tools/crosslink v0.0.0-20220502161954-e2bf744925c0/go.mod h1:0mci40GSYELJTxavWNtFzuy2Z76uzf4dbT+1P0E8MAo= go.opentelemetry.io/build-tools/dbotconf v0.0.0-20220321164008-b8e03aff061a h1:VCNW72z+YKDAH8O5y+WmMuj2Jlgd+ZG5Abk9xTGw6dQ= go.opentelemetry.io/build-tools/dbotconf v0.0.0-20220321164008-b8e03aff061a/go.mod h1:/X2uGFIoHCUyQiBqL6pY6AEU2j8q1e+EMWhZlCsY5dk= go.opentelemetry.io/build-tools/multimod v0.0.0-20210920164323-2ceabab23375 h1:5zVDNFcOwiMee9Qm8sH08iw+9cJZk+l/Y3mVa2D/zmM= @@ -912,14 +921,22 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= +go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= +go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= diff --git a/internal/tools/tools.go b/internal/tools/tools.go index 53b4a545b23..463d26a493f 100644 --- a/internal/tools/tools.go +++ b/internal/tools/tools.go @@ -24,6 +24,7 @@ import ( _ "github.com/itchyny/gojq" _ "github.com/jcchavezs/porto/cmd/porto" _ "github.com/wadey/gocovmerge" + _ "go.opentelemetry.io/build-tools/crosslink" _ "go.opentelemetry.io/build-tools/dbotconf" _ "go.opentelemetry.io/build-tools/multimod" _ "go.opentelemetry.io/build-tools/semconvgen" From 7cb467825192b0945cec280c2fe6f5de2c012738 Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 12:04:20 -0700 Subject: [PATCH 05/10] Fix crosslink target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 72a23f7bddc..356ac4c476d 100644 --- a/Makefile +++ b/Makefile @@ -148,7 +148,7 @@ golangci-lint/%: | $(GOLANGCI_LINT) .PHONY: crosslink crosslink: | $(CROSSLINK) @echo "cross-linking all go modules" \ - && @$(CROSSLINK) --root=$(shell pwd) + && $(CROSSLINK) --root=$(shell pwd) .PHONY: go-mod-tidy go-mod-tidy: $(ALL_GO_MOD_DIRS:%=go-mod-tidy/%) From 2d80d3015c9795e2911a3f2141003f17cc4b13dc Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 12:06:02 -0700 Subject: [PATCH 06/10] Execute make crosslink to clean up go.mod files --- bridge/opencensus/go.mod | 54 ---------------- bridge/opencensus/test/go.mod | 52 --------------- bridge/opentracing/go.mod | 60 ----------------- example/fib/go.mod | 56 ---------------- example/jaeger/go.mod | 56 ---------------- example/namedtracer/go.mod | 56 ---------------- example/opencensus/go.mod | 48 -------------- example/otel-collector/go.mod | 52 --------------- example/passthrough/go.mod | 58 ----------------- example/prometheus/go.mod | 52 --------------- example/zipkin/go.mod | 56 ---------------- exporters/jaeger/go.mod | 58 ----------------- exporters/otlp/internal/retry/go.mod | 64 ------------------- exporters/otlp/otlpmetric/go.mod | 52 --------------- .../otlp/otlpmetric/otlpmetricgrpc/go.mod | 50 --------------- .../otlp/otlpmetric/otlpmetrichttp/go.mod | 50 --------------- exporters/otlp/otlptrace/go.mod | 56 ---------------- exporters/otlp/otlptrace/otlptracegrpc/go.mod | 54 ---------------- exporters/otlp/otlptrace/otlptracehttp/go.mod | 54 ---------------- exporters/prometheus/go.mod | 54 ---------------- exporters/stdout/stdoutmetric/go.mod | 54 ---------------- exporters/stdout/stdouttrace/go.mod | 58 ----------------- exporters/zipkin/go.mod | 58 ----------------- go.mod | 62 ------------------ metric/go.mod | 58 ----------------- schema/go.mod | 64 ------------------- sdk/go.mod | 60 ----------------- sdk/metric/go.mod | 54 ---------------- trace/go.mod | 62 ------------------ 29 files changed, 1622 deletions(-) diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod index 88d652ccf82..f14be6325c1 100644 --- 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/sdk => ../../sdk replace go.opentelemetry.io/otel/metric => ../../metric - - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bridge/opencensus/test/go.mod b/bridge/opencensus/test/go.mod index 376aed14150..722676c4739 100644 --- 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/metric => ../../../metric replace go.opentelemetry.io/otel/sdk => ../../../sdk - - replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../../trace - - - - - - diff --git a/bridge/opentracing/go.mod b/bridge/opentracing/go.mod index 15fc08c33b9..5e362031cc9 100644 --- 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/trace => ../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/example/fib/go.mod b/example/fib/go.mod index 02e5c4a7a39..3a401f92ee2 100644 --- 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/exporters/stdout/stdouttrace => ../../exporters/stdout/stdouttrace - - - - - - - - replace go.opentelemetry.io/otel/sdk => ../../sdk - - - - replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - diff --git a/example/jaeger/go.mod b/example/jaeger/go.mod index b36e6d51f3b..dfa5b00d5d8 100644 --- 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/trace => ../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod index 3007319a362..c35fe5bf676 100644 --- a/example/namedtracer/go.mod +++ b/example/namedtracer/go.mod @@ -15,62 +15,6 @@ require ( go.opentelemetry.io/otel/trace v1.7.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../exporters/stdout/stdouttrace - - - - - - - - - - diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod index 2f91e0b57fe..a51adf7751f 100644 --- a/example/opencensus/go.mod +++ b/example/opencensus/go.mod @@ -18,60 +18,12 @@ require ( go.opentelemetry.io/otel/sdk/metric v0.30.0 ) - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/metric => ../../metric - - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/stdout/stdoutmetric => ../../exporters/stdout/stdoutmetric replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../exporters/stdout/stdouttrace - - - - - - - - - - diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod index 823de3b6c64..f256b8dd8c3 100644 --- a/example/otel-collector/go.mod +++ b/example/otel-collector/go.mod @@ -15,62 +15,10 @@ require ( google.golang.org/grpc v1.46.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ../../trace - - 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/internal/retry => ../../exporters/otlp/internal/retry diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod index c3ed46e313a..4aa81e1666e 100644 --- a/example/passthrough/go.mod +++ b/example/passthrough/go.mod @@ -15,62 +15,4 @@ replace ( go.opentelemetry.io/otel/trace => ../../trace ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/stdout/stdouttrace => ../../exporters/stdout/stdouttrace - - - - - - - - - - diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod index 248b6b23283..3bcc02f96fd 100644 --- a/example/prometheus/go.mod +++ b/example/prometheus/go.mod @@ -15,60 +15,8 @@ require ( go.opentelemetry.io/otel/sdk/metric v0.30.0 ) - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/metric => ../../metric - - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod index 76de0c3c473..12867fd9f45 100644 --- a/example/zipkin/go.mod +++ b/example/zipkin/go.mod @@ -15,60 +15,4 @@ require ( go.opentelemetry.io/otel/trace v1.7.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/exporters/jaeger/go.mod b/exporters/jaeger/go.mod index 5364d02ff7a..c246328a566 100644 --- a/exporters/jaeger/go.mod +++ b/exporters/jaeger/go.mod @@ -10,66 +10,8 @@ require ( go.opentelemetry.io/otel/trace v1.7.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - - - - - replace go.opentelemetry.io/otel => ../.. - - replace go.opentelemetry.io/otel/sdk => ../../sdk - - - - - - - - - - - - - - - - - - diff --git a/exporters/otlp/internal/retry/go.mod b/exporters/otlp/internal/retry/go.mod index 5c3f5dede63..5f5641a4f3a 100644 --- a/exporters/otlp/internal/retry/go.mod +++ b/exporters/otlp/internal/retry/go.mod @@ -6,67 +6,3 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 github.com/stretchr/testify v1.7.1 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/exporters/otlp/otlpmetric/go.mod b/exporters/otlp/otlpmetric/go.mod index 3799bb6aa08..6e799618cd0 100644 --- a/exporters/otlp/otlpmetric/go.mod +++ b/exporters/otlp/otlpmetric/go.mod @@ -23,58 +23,6 @@ replace go.opentelemetry.io/otel/metric => ../../../metric replace go.opentelemetry.io/otel/trace => ../../../trace - - replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../internal/retry - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod index 2bac7ccafdb..8520c54e566 100644 --- a/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod @@ -28,54 +28,4 @@ replace go.opentelemetry.io/otel/metric => ../../../../metric replace go.opentelemetry.io/otel/trace => ../../../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../internal/retry diff --git a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod index 2b453c93103..0b1234dc1a6 100644 --- a/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod +++ b/exporters/otlp/otlpmetric/otlpmetrichttp/go.mod @@ -23,54 +23,4 @@ replace go.opentelemetry.io/otel/metric => ../../../../metric replace go.opentelemetry.io/otel/trace => ../../../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../internal/retry diff --git a/exporters/otlp/otlptrace/go.mod b/exporters/otlp/otlptrace/go.mod index f6afbb8e3fe..233484864fa 100644 --- a/exporters/otlp/otlptrace/go.mod +++ b/exporters/otlp/otlptrace/go.mod @@ -18,62 +18,6 @@ replace go.opentelemetry.io/otel => ../../.. replace go.opentelemetry.io/otel/sdk => ../../../sdk - - replace go.opentelemetry.io/otel/trace => ../../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../internal/retry diff --git a/exporters/otlp/otlptrace/otlptracegrpc/go.mod b/exporters/otlp/otlptrace/otlptracegrpc/go.mod index 97835eeb0c5..47705ca77a6 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/go.mod +++ b/exporters/otlp/otlptrace/otlptracegrpc/go.mod @@ -21,60 +21,6 @@ replace go.opentelemetry.io/otel/sdk => ../../../../sdk replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../ - - replace go.opentelemetry.io/otel/trace => ../../../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../internal/retry diff --git a/exporters/otlp/otlptrace/otlptracehttp/go.mod b/exporters/otlp/otlptrace/otlptracehttp/go.mod index 267f277ce86..23940e9a5c0 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/go.mod +++ b/exporters/otlp/otlptrace/otlptracehttp/go.mod @@ -17,62 +17,8 @@ replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => ../ replace go.opentelemetry.io/otel => ../../../.. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/sdk => ../../../../sdk - - - - replace go.opentelemetry.io/otel/trace => ../../../../trace - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => ../../internal/retry diff --git a/exporters/prometheus/go.mod b/exporters/prometheus/go.mod index 627b13f8d72..c0681369192 100644 --- a/exporters/prometheus/go.mod +++ b/exporters/prometheus/go.mod @@ -13,64 +13,10 @@ require ( replace go.opentelemetry.io/otel => ../.. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/metric => ../../metric replace go.opentelemetry.io/otel/sdk => ../../sdk - - replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - - - - - - - - - - - - - diff --git a/exporters/stdout/stdoutmetric/go.mod b/exporters/stdout/stdoutmetric/go.mod index 091b2a6174a..83436139ede 100644 --- a/exporters/stdout/stdoutmetric/go.mod +++ b/exporters/stdout/stdoutmetric/go.mod @@ -15,62 +15,8 @@ require ( go.opentelemetry.io/otel/sdk/metric v0.30.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/metric => ../../../metric - - replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric replace go.opentelemetry.io/otel/trace => ../../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/exporters/stdout/stdouttrace/go.mod b/exporters/stdout/stdouttrace/go.mod index 0e895b055db..8edf46f1dc5 100644 --- a/exporters/stdout/stdouttrace/go.mod +++ b/exporters/stdout/stdouttrace/go.mod @@ -14,62 +14,4 @@ require ( go.opentelemetry.io/otel/trace v1.7.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ../../../trace - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/exporters/zipkin/go.mod b/exporters/zipkin/go.mod index 2aca9272b8e..40cc03313a8 100644 --- a/exporters/zipkin/go.mod +++ b/exporters/zipkin/go.mod @@ -11,66 +11,8 @@ require ( go.opentelemetry.io/otel/trace v1.7.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ../../trace - - - - - - - - - - replace go.opentelemetry.io/otel => ../.. replace go.opentelemetry.io/otel/sdk => ../../sdk - - - - - - - - - - - - - - - - - - diff --git a/go.mod b/go.mod index 7f74f1ff0f8..cb6feb023fd 100644 --- a/go.mod +++ b/go.mod @@ -10,66 +10,4 @@ require ( go.opentelemetry.io/otel/trace v1.7.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ./trace - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/metric/go.mod b/metric/go.mod index 5ccf0a0c327..223f1e9fcd9 100644 --- a/metric/go.mod +++ b/metric/go.mod @@ -9,62 +9,4 @@ require ( replace go.opentelemetry.io/otel => ../ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ../trace - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/schema/go.mod b/schema/go.mod index 8751250531e..e2127999806 100644 --- a/schema/go.mod +++ b/schema/go.mod @@ -7,67 +7,3 @@ require ( github.com/stretchr/testify v1.7.1 gopkg.in/yaml.v2 v2.4.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdk/go.mod b/sdk/go.mod index 379c263defb..4f4212332c6 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -13,64 +13,4 @@ require ( golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/trace => ../trace - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdk/metric/go.mod b/sdk/metric/go.mod index 103f1f89f72..0fb932027b8 100644 --- a/sdk/metric/go.mod +++ b/sdk/metric/go.mod @@ -4,38 +4,10 @@ go 1.16 replace go.opentelemetry.io/otel => ../.. - - - - - - - - - - - - - - - - - - - - - - - - replace go.opentelemetry.io/otel/metric => ../../metric replace go.opentelemetry.io/otel/sdk => ../ - - - - replace go.opentelemetry.io/otel/trace => ../../trace require ( @@ -45,29 +17,3 @@ require ( go.opentelemetry.io/otel/metric v0.30.0 go.opentelemetry.io/otel/sdk v1.7.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/trace/go.mod b/trace/go.mod index 1ba602356aa..1a8d9723229 100644 --- a/trace/go.mod +++ b/trace/go.mod @@ -4,70 +4,8 @@ go 1.16 replace go.opentelemetry.io/otel => ../ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - require ( github.com/google/go-cmp v0.5.8 github.com/stretchr/testify v1.7.1 go.opentelemetry.io/otel v1.7.0 ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - From b057749537ea67c9d6eb211f8798755729e58cbd Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 12:14:17 -0700 Subject: [PATCH 07/10] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b64a142286d..a85bb15d688 100644 --- 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. (#TBD) + ## [1.7.0/0.30.0] - 2022-04-28 ### Added From 80bd500f299315a17af15bc31567b8b54c83e8be Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 12:14:57 -0700 Subject: [PATCH 08/10] Misc go.sum update from make precommit --- go.sum | 3 +++ trace/go.sum | 3 +++ 2 files changed, 6 insertions(+) diff --git a/go.sum b/go.sum index f6a0b224951..da1754cb88e 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,7 @@ github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -12,6 +13,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/trace/go.sum b/trace/go.sum index 16e48e5a87a..146a5ee561f 100644 --- a/trace/go.sum +++ b/trace/go.sum @@ -3,6 +3,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -10,6 +11,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= From 5be9712ca13aa803af365dddaa8168eb631e9d28 Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 4 May 2022 12:20:10 -0700 Subject: [PATCH 09/10] Update CHANGELOG PR number --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a85bb15d688..3e13e50b309 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed -- The `crosslink` make target has been updated to use the `go.opentelemetry.io/build-tools/crosslink` package. (#TBD) +- 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 From f8af6c5706f862744c72c7d7bfef99cbb4ddd666 Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Thu, 5 May 2022 11:53:24 -0700 Subject: [PATCH 10/10] Update crosslink target to include prune --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 356ac4c476d..d847bd13d54 100644 --- a/Makefile +++ b/Makefile @@ -147,8 +147,8 @@ golangci-lint/%: | $(GOLANGCI_LINT) .PHONY: crosslink crosslink: | $(CROSSLINK) - @echo "cross-linking all go modules" \ - && $(CROSSLINK) --root=$(shell pwd) + @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/%)