Skip to content

Commit

Permalink
Merge branch 'main' into bump-go-ci-ver
Browse files Browse the repository at this point in the history
  • Loading branch information
MrAlias authored Jun 5, 2024
2 parents b308807 + 11cf0df commit 68fbd0d
Show file tree
Hide file tree
Showing 37 changed files with 25 additions and 130 deletions.
15 changes: 0 additions & 15 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,16 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

- The `go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5551]. (#5598)
- The `go.opentelemetry.io/contrib/detectors/aws/lambda` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5545]. (#5641)
- The `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5546]. (#5642)
- The `go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5547]. (#5643)
- The `go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5549]. (#5644)
- The `go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5550]. (#5645)
- The `go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5552]. (#5646)
- The `go.opentelemetry.io/contrib/propagators/aws` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5553]. (#5647)
- The `go.opentelemetry.io/contrib/samplers/aws/xray` package is deprecated.
If you would like to become a Code Owner of this module and prevent it from being removed, see [#5554]. (#5647)

[#5545]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5545
[#5546]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5546
[#5547]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5547
[#5549]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5549
[#5550]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5550
[#5551]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5551
[#5552]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5552
[#5553]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5553
[#5554]: https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5554

### Changed
Expand Down
14 changes: 7 additions & 7 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ bridges/otelzap/ @open-te

config/ @open-telemetry/go-approvers @MadVikingGod @pellared @codeboten

detectors/aws/ec2 @open-telemetry/go-approvers @pyohannes
detectors/aws/ecs @open-telemetry/go-approvers @pyohannes
detectors/aws/ec2 @open-telemetry/go-approvers @pyohannes @akats7
detectors/aws/ecs @open-telemetry/go-approvers @pyohannes @akats7
detectors/aws/eks @open-telemetry/go-approvers @pyohannes
detectors/aws/lambda @open-telemetry/go-approvers
detectors/aws/lambda @open-telemetry/go-approvers @akats7
detectors/gcp/ @open-telemetry/go-approvers @dashpole

exporters/autoexport @open-telemetry/go-approvers @MikeGoldsmith @pellared

instrumentation/github.com/aws/aws-lambda-go/otellambda/ @open-telemetry/go-approvers
instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/ @open-telemetry/go-approvers
instrumentation/github.com/aws/aws-lambda-go/otellambda/ @open-telemetry/go-approvers @akats7
instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/ @open-telemetry/go-approvers @akats7
instrumentation/github.com/emicklei/go-restful/otelrestful/ @open-telemetry/go-approvers @dashpole
instrumentation/github.com/gin-gonic/gin/otelgin/ @open-telemetry/go-approvers @hanyuancheung
instrumentation/github.com/gorilla/mux/otelmux/ @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/go.mongodb.org/mongo-driver/mongo/otelmongo/ @open-telemetry/go-approvers
instrumentation/google.golang.org/grpc/otelgrpc/ @open-telemetry/go-approvers @dashpole @hanyuancheung
Expand All @@ -58,7 +58,7 @@ instrumentation/runtime/ @open-te
processors/baggage/baggagetrace @open-telemetry/go-approvers @codeboten @MikeGoldsmith

propagators/autoprop/ @open-telemetry/go-approvers @MrAlias
propagators/aws/ @open-telemetry/go-approvers
propagators/aws/ @open-telemetry/go-approvers @akats7
propagators/b3/ @open-telemetry/go-approvers @pellared
propagators/jaeger/ @open-telemetry/go-approvers @yurishkuro
propagators/opencensus/ @open-telemetry/go-approvers @dashpole
Expand Down
9 changes: 0 additions & 9 deletions detectors/aws/lambda/detector.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Package lambda provide an OpenTelemetry resource detector for AWS Lambda
// instances.
//
// Deprecated: lambda 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/5545
package lambda // import "go.opentelemetry.io/contrib/detectors/aws/lambda"

import (
Expand Down
1 change: 0 additions & 1 deletion detectors/aws/lambda/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: lambda has no Code Owner.
module go.opentelemetry.io/contrib/detectors/aws/lambda

go 1.21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,4 @@
//
// lambda.Start(<user function>) entrypoint: lambda.Start(otellambda.InstrumentHandler(<user function>))
// lambda.StartHandler(<user Handler>) entrypoint: lambda.StartHandler(otellambda.WrapHandler(<user Handler>))
//
// Deprecated: otellambda 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/5546
package otellambda // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda"
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# aws/aws-lambda-go instrumentation example

:warning: Deprecated: otellambda has no Code Owner.

A simple example to demonstrate the AWS Lambda for Go instrumentation. In this example, container `aws-lambda-client` initializes an S3 client and an HTTP client and runs 2 basic operations: `listS3Buckets` and `GET`.


Expand Down Expand Up @@ -33,4 +31,4 @@ Note: Because the example runs on AWS Lambda, a handful of resources are created

```sh
./manualAWSCleanup.sh
```
```
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otellambda has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/example

go 1.21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
awsConfig "github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/service/s3"

lambdadetector "go.opentelemetry.io/contrib/detectors/aws/lambda" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" // nolint:staticcheck // deprecated.
lambdadetector "go.opentelemetry.io/contrib/detectors/aws/lambda"
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda"
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otellambda has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda

go 1.21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,5 @@ Package test validates AWS Lambda 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: otellambda 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/5546
*/
package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test"
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otellambda has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test

go 1.21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"github.com/aws/aws-lambda-go/lambdacontext"
"github.com/stretchr/testify/assert"

lambdadetector "go.opentelemetry.io/contrib/detectors/aws/lambda" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/propagators/aws/xray" // nolint:staticcheck // deprecated.
lambdadetector "go.opentelemetry.io/contrib/detectors/aws/lambda"
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda"
"go.opentelemetry.io/contrib/propagators/aws/xray"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/sdk/instrumentation"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
[![Go Reference][goref-image]][goref-url]
[![Apache License][license-image]][license-url]

:warning: Deprecated: otellambda has no Code Owner.

This module provides recommended configuration options for [`AWS Lambda Instrumentation`](https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/instrumentation/github.com/aws/aws-lambda-go/otellambda) when using [AWS X-Ray](https://aws.amazon.com/xray/). By using this configuration, trace context will automatically be extracted from incoming requests with the `X-Amzn-Trace-Id` header if present. Trace context will also always be injected using the `X-Amzn-Trace-Id` format into downstream requests from the Lambda function.

## Installation
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otellambda has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig

go 1.21
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Package xrayconfig provides configuration for the otellambda package.
//
// Deprecated: otellambda 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/5546
package xrayconfig // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig"

import (
"context"
"os"

lambdadetector "go.opentelemetry.io/contrib/detectors/aws/lambda" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/propagators/aws/xray" // nolint:staticcheck // deprecated.
lambdadetector "go.opentelemetry.io/contrib/detectors/aws/lambda"
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda"
"go.opentelemetry.io/contrib/propagators/aws/xray"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"go.opentelemetry.io/otel/propagation"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/aws/aws-lambda-go/lambdacontext"
"github.com/stretchr/testify/assert"

"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/propagators/aws/xray" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda"
"go.opentelemetry.io/contrib/propagators/aws/xray"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/trace"
v1common "go.opentelemetry.io/proto/otlp/common/v1"
Expand Down
8 changes: 0 additions & 8 deletions instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

// Package otelaws instruments the github.com/aws/aws-sdk-go-v2 package.
//
// Deprecated: otelaws 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/5547
package otelaws // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws"

import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# aws/aws-sdk-go-v2 instrumentation example

:warning: Deprecated: otelaws has no Code Owner.

A simple example to demonstrate the AWS SDK V2 for Go instrumentation. In this example, container `aws-sdk-client` initializes a S3 client and a DynamoDB client and runs 2 basic operations: `listS3Buckets` and `listDynamodbTables`.


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otelaws has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example

go 1.21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/dynamodb"
"github.com/aws/aws-sdk-go-v2/service/s3"

"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws"
"go.opentelemetry.io/otel"
stdout "go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otelaws has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws

go 1.21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,5 @@ Package test validates the otelaws 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: otelaws 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/5547
*/
package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test"
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otelaws has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test

go 1.21
Expand Down
7 changes: 0 additions & 7 deletions instrumentation/github.com/gorilla/mux/otelmux/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,4 @@
//
// Currently only the routing of a received message can be instrumented. To do
// it, use the Middleware function.
//
// Deprecated: otelmux 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/5549
package otelmux // import "go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux"
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# gorilla/mux instrumentation example

:warning: Deprecated: otelmux has no Code Owner.

An HTTP server using gorilla/mux and instrumentation. The server has a
`/users/{id:[0-9]+}` endpoint. The server generates span information to
`stdout`.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otelmux has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/example

go 1.21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/gorilla/mux"

"go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
stdout "go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
Expand Down
1 change: 0 additions & 1 deletion instrumentation/github.com/gorilla/mux/otelmux/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otelmux has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux

go 1.21
Expand Down
7 changes: 0 additions & 7 deletions instrumentation/github.com/gorilla/mux/otelmux/test/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,5 @@ Package test validates the otelmux 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: otelmux 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/5549
*/
package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/test"
1 change: 0 additions & 1 deletion instrumentation/github.com/gorilla/mux/otelmux/test/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// Deprecated: otelmux has no Code Owner.
module go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/test

go 1.21
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux" // nolint:staticcheck // deprecated.
"go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/propagation"
Expand Down
Loading

0 comments on commit 68fbd0d

Please sign in to comment.