Merge branch 'main' into update_core

open-telemetry · Oct 11, 2024 · ad6aa7c · ad6aa7c
2 parents ac9c562 + 79bb705
commit ad6aa7c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - The function signature of `NewLogProcessor` in `go.opentelemetry.io/contrib/processors/minsev` has changed to accept the added `Severitier` interface instead of a `log.Severity`. (#6116)
 - `NewSDK` in `go.opentelemetry.io/contrib/config` now returns a no-op SDK if `disabled` is set to `true`. (#6185)
+- The deprecated `go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho` package has found a Code Owner.
+  The package is no longer deprecated. (#6207)
 
 ### Fixed
 

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -47,7 +47,7 @@ instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/                   @open-te
 instrumentation/github.com/emicklei/go-restful/otelrestful/             @open-telemetry/go-approvers @dashpole
 instrumentation/github.com/gin-gonic/gin/otelgin/                       @open-telemetry/go-approvers
 instrumentation/github.com/gorilla/mux/otelmux/                         @open-telemetry/go-approvers @akats7
-instrumentation/github.com/labstack/echo/otelecho/                      @open-telemetry/go-approvers
+instrumentation/github.com/labstack/echo/otelecho/                      @open-telemetry/go-approvers @scorpionknifes
 instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/            @open-telemetry/go-approvers
 instrumentation/google.golang.org/grpc/otelgrpc/                        @open-telemetry/go-approvers @dashpole
 

diff --git a/instrumentation/github.com/labstack/echo/otelecho/doc.go b/instrumentation/github.com/labstack/echo/otelecho/doc.go
@@ -6,11 +6,4 @@
 //
 // Currently only the routing of a received message can be instrumented. To do
 // so, use the Middleware function.
-//
-// Deprecated: otelecho has no Code Owner.
-// After August 21, 2024, it may no longer be supported and may stop
-// receiving new releases unless a new Code Owner is found. See
-// [this issue] if you would like to become the Code Owner of this module.
-//
-// [this issue]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5550
 package otelecho // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho"
diff --git a/instrumentation/github.com/labstack/echo/otelecho/example/README.md b/instrumentation/github.com/labstack/echo/otelecho/example/README.md
@@ -1,7 +1,5 @@
 # labstack echo instrumentation example
 
-:warning: Deprecated: otelecho has no Code Owner.
-
 An HTTP server using labstack echo and instrumentation. The server has a
 `/users/:id` endpoint. The server generates span information to
 `stdout`.

diff --git a/instrumentation/github.com/labstack/echo/otelecho/example/go.mod b/instrumentation/github.com/labstack/echo/otelecho/example/go.mod
@@ -1,4 +1,3 @@
-// Deprecated: otelecho has no Code Owner.
 module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/example
 
 go 1.22

diff --git a/instrumentation/github.com/labstack/echo/otelecho/example/server.go b/instrumentation/github.com/labstack/echo/otelecho/example/server.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 
-	"go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho" // nolint:staticcheck  // deprecated.
+	"go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	stdout "go.opentelemetry.io/otel/exporters/stdout/stdouttrace"

diff --git a/instrumentation/github.com/labstack/echo/otelecho/go.mod b/instrumentation/github.com/labstack/echo/otelecho/go.mod
@@ -1,4 +1,3 @@
-// Deprecated: otelecho has no Code Owner.
 module go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho
 
 go 1.22

diff --git a/instrumentation/github.com/labstack/echo/otelecho/test/doc.go b/instrumentation/github.com/labstack/echo/otelecho/test/doc.go
@@ -1,18 +1,9 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-/*
-Package test validates the otelecho instrumentation with the default SDK.
-
-This package is in a separate module from the instrumentation it tests to
-isolate the dependency of the default SDK and not impose this as a transitive
-dependency for users.
-
-Deprecated: otelecho has no Code Owner.
-After August 21, 2024, it may no longer be supported and may stop
-receiving new releases unless a new Code Owner is found. See
-[this issue] if you would like to become the Code Owner of this module.
-
-[this issue]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5550
-*/
+// Package test validates the otelecho instrumentation with the default SDK.
+//
+// This package is in a separate module from the instrumentation it tests to
+// isolate the dependency of the default SDK and not impose this as a transitive
+// dependency for users.
 package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/test"
diff --git a/instrumentation/github.com/labstack/echo/otelecho/test/echo_test.go b/instrumentation/github.com/labstack/echo/otelecho/test/echo_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho" // nolint:staticcheck  // deprecated.
+	"go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/sdk/trace"