Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make possible adding custom attributes to the shipped otelhttp client metrics - #5084 #5086

Closed
wants to merge 12 commits into from

Conversation

zailic
Copy link
Contributor

@zailic zailic commented Feb 13, 2024

More details on #5084.

@zailic zailic requested a review from a team February 13, 2024 14:36
Copy link

linux-foundation-easycla bot commented Feb 13, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

@dmathieu
Copy link
Member

dmathieu commented Feb 13, 2024

You will need to sign the CLA, add a changelog as well as tests.

@@ -48,7 +48,7 @@ type labelerContextKeyType int

const lablelerContextKey labelerContextKeyType = 0

func injectLabeler(ctx context.Context, l *Labeler) context.Context {
func InjectLabeler(ctx context.Context, l *Labeler) context.Context {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this need to become public?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise you cannot inject a Labeler component outside the otelhttp module.(as labelerContextKey is private as well). The given details on #5084 aren't clear enough?

@dmathieu dmathieu marked this pull request as draft February 13, 2024 15:13
zailic and others added 9 commits February 13, 2024 17:50
…ry#5081)

* dependabot updates Mon Feb 12 15:30:58 UTC 2024
build(deps): bump go.opentelemetry.io/otel/sdk from 1.23.0 to 1.23.1 in /instrumentation/github.com/labstack/echo/otelecho/test
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /instrumentation/github.com/labstack/echo/otelecho/test
build(deps): bump go.opentelemetry.io/otel/trace from 1.23.0 to 1.23.1 in /instrumentation/github.com/labstack/echo/otelecho/test
build(deps): bump go.opentelemetry.io/otel/trace from 1.23.0 to 1.23.1 in /propagators/b3
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /propagators/b3
build(deps): bump go.opentelemetry.io/otel/trace from 1.23.0 to 1.23.1 in /instrumentation/github.com/labstack/echo/otelecho
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /instrumentation/github.com/labstack/echo/otelecho
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /instrumentation/github.com/aws/aws-lambda-go/otellambda/example
build(deps): bump go.opentelemetry.io/otel/trace from 1.23.0 to 1.23.1 in /propagators/ot
build(deps): bump go.opentelemetry.io/otel/exporters/stdout/stdouttrace from 1.23.0 to 1.23.1 in /instrumentation/github.com/aws/aws-lambda-go/otellambda/example
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /propagators/ot
build(deps): bump go.opentelemetry.io/otel/sdk from 1.23.0 to 1.23.1 in /instrumentation/github.com/aws/aws-lambda-go/otellambda/example
build(deps): bump github.com/golangci/golangci-lint from 1.55.2 to 1.56.1 in /tools
build(deps): bump golang.org/x/vuln from 1.0.3 to 1.0.4 in /tools
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /detectors/aws/ecs
build(deps): bump go.opentelemetry.io/otel/sdk from 1.23.0 to 1.23.1 in /detectors/aws/ecs
build(deps): bump go.opentelemetry.io/otel/trace from 1.23.0 to 1.23.1 in /instrumentation/github.com/aws/aws-lambda-go/otellambda
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /instrumentation/github.com/aws/aws-lambda-go/otellambda
build(deps): bump go.opentelemetry.io/otel/sdk from 1.23.0 to 1.23.1 in /instrumentation/host/example
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /instrumentation/host/example
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /samplers/aws/xray
build(deps): bump go.opentelemetry.io/otel/exporters/stdout/stdoutmetric from 1.23.0 to 1.23.1 in /instrumentation/host/example
build(deps): bump go.opentelemetry.io/otel/sdk from 1.23.0 to 1.23.1 in /samplers/aws/xray
build(deps): bump go.opentelemetry.io/otel/sdk/metric from 1.23.0 to 1.23.1 in /instrumentation/host/example
build(deps): bump go.opentelemetry.io/otel/trace from 1.23.0 to 1.23.1 in /samplers/aws/xray
build(deps): bump go.opentelemetry.io/otel/sdk from 1.23.0 to 1.23.1 in /detectors/aws/lambda
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /detectors/aws/lambda
build(deps): bump go.opentelemetry.io/otel/sdk from 1.23.0 to 1.23.1 in /detectors/aws/ec2
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /detectors/aws/ec2
build(deps): bump go.opentelemetry.io/otel from 1.23.0 to 1.23.1 in /instrumentation/runtime

* Apply lint fixes

---------

Co-authored-by: Tyler Yahn <[email protected]>
build(deps): bump github.com/aws/aws-sdk-go from 1.50.10 to 1.50.15 in /detectors/aws/ec2
build(deps): bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc from 1.23.0 to 1.23.1 in /config
build(deps): bump golang.org/x/net from 0.20.0 to 0.21.0 in /instrumentation/google.golang.org/grpc/otelgrpc/example
build(deps): bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc from 1.23.0 to 1.23.1 in /instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig
build(deps): bump go.opentelemetry.io/otel/exporters/otlp/otlptrace from 1.23.0 to 1.23.1 in /exporters/autoexport
build(deps): bump go.opentelemetry.io/otel/exporters/prometheus from 0.45.1 to 0.45.2 in /exporters/autoexport
build(deps): bump go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc from 1.23.0 to 1.23.1 in /exporters/autoexport
build(deps): bump go.opentelemetry.io/otel/bridge/opencensus from 1.23.0 to 1.23.1 in /propagators/opencensus
Bumps golang from 1.21-alpine to 1.22-alpine.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Yahn <[email protected]>
Bumps golang from 1.21-alpine to 1.22-alpine.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Yahn <[email protected]>
Bumps golang from 1.21 to 1.22.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Yahn <[email protected]>
Bumps golang from 1.21-alpine to 1.22-alpine.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Yahn <[email protected]>
open-telemetry#4964)

Bumps golang from 1.21-alpine to 1.22-alpine.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Yahn <[email protected]>
…emetry#4897)

* fork a subset of google.golang.org/grpc/interop to otelgrpc

---------

Co-authored-by: David Ashpole <[email protected]>
Co-authored-by: Tyler Yahn <[email protected]>
dmathieu and others added 3 commits February 13, 2024 19:29
…#5080)

* use an atomic.Int64 as bodyWrapper read bytes counter

* add changelog entry

---------

Co-authored-by: Tyler Yahn <[email protected]>
* Update README

* Update changelog

* Update CI workflows

* Update Dockerfiles

* Update changelog entry PR number
@zailic
Copy link
Contributor Author

zailic commented Feb 18, 2024

i will close it in favor of #5129

@zailic zailic closed this Feb 18, 2024
@zailic zailic deleted the bugfix/issue-5084 branch March 19, 2024 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants