diff --git a/.gitignore b/.gitignore index 895c7664beb..ae8577ef366 100644 --- a/.gitignore +++ b/.gitignore @@ -12,11 +12,3 @@ go.work go.work.sum gen/ - -/example/dice/dice -/example/namedtracer/namedtracer -/example/otel-collector/otel-collector -/example/opencensus/opencensus -/example/passthrough/passthrough -/example/prometheus/prometheus -/example/zipkin/zipkin diff --git a/.golangci.yml b/.golangci.yml index d09555506f7..dbfb2a165a0 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -127,8 +127,6 @@ linters-settings: - "**/metric/**/*.go" - "**/bridge/*.go" - "**/bridge/**/*.go" - - "**/example/*.go" - - "**/example/**/*.go" - "**/trace/*.go" - "**/trace/**/*.go" - "**/log/*.go" diff --git a/CHANGELOG.md b/CHANGELOG.md index b4f90763a1c..6b9589f3053 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Support scope attributes and make them as identifying for `Logger` in `go.opentelemetry.io/otel` and `go.opentelemetry.io/otel/sdk/log`. (#5925) - Make schema URL and scope attributes as identifying for `Tracer` in `go.opentelemetry.io/otel/bridge/opentracing`. (#5931) +### Removed + +- Remove all examples under `go.opentelemetry.io/otel/example` as they are moved to [Contrib repository](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/examples). (#5930) + diff --git a/example/dice/go.mod b/example/dice/go.mod deleted file mode 100644 index 7e27ca92fc6..00000000000 --- a/example/dice/go.mod +++ /dev/null @@ -1,4 +0,0 @@ -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -module go.opentelemetry.io/otel/example/dice - -go 1.22 diff --git a/example/dice/go.sum b/example/dice/go.sum deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/example/dice/main.go b/example/dice/main.go deleted file mode 100644 index b77b997ae36..00000000000 --- a/example/dice/main.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -// Dice is the "Roll the dice" application. -// -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -package main - -func main() { -} diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod deleted file mode 100644 index 43ae5b6f1eb..00000000000 --- a/example/namedtracer/go.mod +++ /dev/null @@ -1,4 +0,0 @@ -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -module go.opentelemetry.io/otel/example/namedtracer - -go 1.22 diff --git a/example/namedtracer/go.sum b/example/namedtracer/go.sum deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/example/namedtracer/main.go b/example/namedtracer/main.go deleted file mode 100644 index c06115fe25a..00000000000 --- a/example/namedtracer/main.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -// Named tracer example. -// -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -package main - -func main() { -} diff --git a/example/opencensus/go.mod b/example/opencensus/go.mod deleted file mode 100644 index 6bfffba6e0a..00000000000 --- a/example/opencensus/go.mod +++ /dev/null @@ -1,4 +0,0 @@ -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -module go.opentelemetry.io/otel/example/opencensus - -go 1.22 diff --git a/example/opencensus/go.sum b/example/opencensus/go.sum deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/example/opencensus/main.go b/example/opencensus/main.go deleted file mode 100644 index 329aeec22b5..00000000000 --- a/example/opencensus/main.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -// OpenCensus example. -// -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -package main - -func main() { -} diff --git a/example/otel-collector/go.mod b/example/otel-collector/go.mod deleted file mode 100644 index a92400cad49..00000000000 --- a/example/otel-collector/go.mod +++ /dev/null @@ -1,4 +0,0 @@ -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -module go.opentelemetry.io/otel/example/otel-collector - -go 1.22 diff --git a/example/otel-collector/go.sum b/example/otel-collector/go.sum deleted file mode 100644 index d3f5a12faa9..00000000000 --- a/example/otel-collector/go.sum +++ /dev/null @@ -1 +0,0 @@ - diff --git a/example/otel-collector/main.go b/example/otel-collector/main.go deleted file mode 100644 index 38b2c85c291..00000000000 --- a/example/otel-collector/main.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -// OpenTelemetry Collector example. -// -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -package main - -func main() { -} diff --git a/example/passthrough/go.mod b/example/passthrough/go.mod deleted file mode 100644 index 9618f2ab784..00000000000 --- a/example/passthrough/go.mod +++ /dev/null @@ -1,4 +0,0 @@ -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -module go.opentelemetry.io/otel/example/passthrough - -go 1.22 diff --git a/example/passthrough/go.sum b/example/passthrough/go.sum deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/example/passthrough/main.go b/example/passthrough/main.go deleted file mode 100644 index 38930e7a4fd..00000000000 --- a/example/passthrough/main.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -// Passthrough example. -// -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -package main - -func main() { -} diff --git a/example/prometheus/go.mod b/example/prometheus/go.mod deleted file mode 100644 index 973dc945340..00000000000 --- a/example/prometheus/go.mod +++ /dev/null @@ -1,4 +0,0 @@ -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -module go.opentelemetry.io/otel/example/prometheus - -go 1.22 diff --git a/example/prometheus/go.sum b/example/prometheus/go.sum deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/example/prometheus/main.go b/example/prometheus/main.go deleted file mode 100644 index 0f298e0de92..00000000000 --- a/example/prometheus/main.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -// Package main provides a code sample of the Prometheus exporter. -// -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -package main - -func main() { -} diff --git a/example/zipkin/go.mod b/example/zipkin/go.mod deleted file mode 100644 index 5a1413ae292..00000000000 --- a/example/zipkin/go.mod +++ /dev/null @@ -1,4 +0,0 @@ -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -module go.opentelemetry.io/otel/example/zipkin - -go 1.22 diff --git a/example/zipkin/go.sum b/example/zipkin/go.sum deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/example/zipkin/main.go b/example/zipkin/main.go deleted file mode 100644 index 0f298e0de92..00000000000 --- a/example/zipkin/main.go +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -// Package main provides a code sample of the Prometheus exporter. -// -// Deprecated: Examples are moved to https://github.com/open-telemetry/opentelemetry-go-contrib. -package main - -func main() { -} diff --git a/versions.yaml b/versions.yaml index cdebdb5eb78..6e90acfb891 100644 --- a/versions.yaml +++ b/versions.yaml @@ -10,12 +10,6 @@ module-sets: - go.opentelemetry.io/otel/bridge/opencensus/test - go.opentelemetry.io/otel/bridge/opentracing - go.opentelemetry.io/otel/bridge/opentracing/test - - go.opentelemetry.io/otel/example/dice - - go.opentelemetry.io/otel/example/namedtracer - - go.opentelemetry.io/otel/example/opencensus - - go.opentelemetry.io/otel/example/otel-collector - - go.opentelemetry.io/otel/example/passthrough - - go.opentelemetry.io/otel/example/zipkin - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp - go.opentelemetry.io/otel/exporters/otlp/otlptrace @@ -31,7 +25,6 @@ module-sets: experimental-metrics: version: v0.53.0 modules: - - go.opentelemetry.io/otel/example/prometheus - go.opentelemetry.io/otel/exporters/prometheus experimental-logs: version: v0.7.0