Skip to content

Commit

Permalink
chore(deps): Bump go.opentelemetry.io/contrib/instrumentation/google.…
Browse files Browse the repository at this point in the history 
…golang.org/grpc/otelgrpc from 0.45.0 to 0.46.0 (#1871)

Bumps
[go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib)
from 0.45.0 to 0.46.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/releases">go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc's
releases</a>.</em></p>
<blockquote>
<h2>Release v1.21.0/v0.46.0/v0.15.0/v0.1.0</h2>
<h3>Added</h3>
<ul>
<li>Add the new <code>go.opentelemetry.io/contrib/instrgen</code>
package to provide auto-generated source code instrumentation. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/3068">#3068</a>,
<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/3108">#3108</a>)</li>
<li>Add
<code>&quot;go.opentelemetry.io/contrib/samplers/jaegerremote&quot;.WithSamplingStrategyFetcher</code>
which sets custom fetcher implementation. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4045">#4045</a>)</li>
<li>Add <code>&quot;go.opentelemetry.io/contrib/config&quot;</code>
package that includes configuration models generated via go-jsonschema.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4376">#4376</a>)</li>
<li>Add <code>NewSDK</code> function to
<code>&quot;go.opentelemetry.io/contrib/config&quot;</code>. The initial
implementation only returns noop providers. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4414">#4414</a>)</li>
<li>Add metrics support (No-op, OTLP and Prometheus) to
<code>go.opentelemetry.io/contrib/exporters/autoexport</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4229">#4229</a>,
<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4479">#4479</a>)</li>
<li>Add support for <code>console</code> span exporter and metrics
exporter in
<code>go.opentelemetry.io/contrib/exporters/autoexport</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4486">#4486</a>)</li>
<li>Set unit and description on all instruments in
<code>go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp</code>.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4500">#4500</a>)</li>
<li>Add metric support for <code>grpc.StatsHandler</code> in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc</code>.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4356">#4356</a>)</li>
<li>Expose the name of the scopes in all instrumentation libraries as
<code>ScopeName</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4448">#4448</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Dropped compatibility testing for [Go 1.19].
The project no longer guarantees support for this version of Go. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4352">#4352</a>)</li>
<li>Upgrade dependencies of OpenTelemetry Go to use the new <a
href="https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.20.0"><code>v1.20.0</code>/<code>v0.43.0</code>
release</a>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4546">#4546</a>)</li>
<li>In <code>go.opentelemetry.io/contrib/exporters/autoexport</code>,
<code>Option</code> was renamed to <code>SpanOption</code>. The old name
is deprecated but continues to be supported as an alias. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4229">#4229</a>)</li>
</ul>
<h3>Deprecated</h3>
<ul>
<li>The interceptors (<code>UnaryClientInterceptor</code>,
<code>StreamClientInterceptor</code>,
<code>UnaryServerInterceptor</code>,
<code>StreamServerInterceptor</code>,
<code>WithInterceptorFilter</code>) are deprecated. Use stats handlers
(<code>NewClientHandler</code>, <code>NewServerHandler</code>) instead.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4534">#4534</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>The <code>go.opentelemetry.io/contrib/samplers/jaegerremote</code>
sampler does not panic when the default HTTP round-tripper
(<code>http.DefaultTransport</code>) is not
<code>*http.Transport</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4045">#4045</a>)</li>
<li>The <code>UnaryServerInterceptor</code> in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc</code>
now sets gRPC status code correctly for the
<code>rpc.server.duration</code> metric. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4481">#4481</a>)</li>
<li>The <code>NewClientHandler</code>, <code>NewServerHandler</code> in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc</code>
now honor <code>otelgrpc.WithMessageEvents</code> options. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4536">#4536</a>)</li>
</ul>
<h2>Release v1.20.0/v0.45.0/v0.14.0</h2>
<h3>Added</h3>
<ul>
<li>Set the description for the <code>rpc.server.duration</code> metric
in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc</code>.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4302">#4302</a>)</li>
<li>Add <code>NewServerHandler</code> and <code>NewClientHandler</code>
that return a <code>grpc.StatsHandler</code> used for gRPC
instrumentation in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc</code>.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/3002">#3002</a>)</li>
<li>Add new Prometheus bridge module in
<code>go.opentelemetry.io/contrib/bridges/prometheus</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4227">#4227</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Upgrade dependencies of OpenTelemetry Go to use the new <a
href="https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.19.0"><code>v1.19.0</code>/<code>v0.42.0</code>/<code>v0.0.7</code>
release</a>.</li>
<li>Use <code>grpc.StatsHandler</code> for gRPC instrumentation in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/example</code>.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4325">#4325</a>)</li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/puckpuck"><code>@​puckpuck</code></a>
made their first contribution in <a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/pull/4302">open-telemetry/opentelemetry-go-contrib#4302</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v1.19.0...v1.20.0">https://github.com/open-telemetry/opentelemetry-go-contrib/compare/v1.19.0...v1.20.0</a></p>
<h2>Release v1.19.0/v0.44.0/v0.13.0</h2>
<h3>Added</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md">go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc's
changelog</a>.</em></p>
<blockquote>
<h2>[1.21.0/0.46.0/0.15.0/0.1.0] - 2023-11-10</h2>
<h3>Added</h3>
<ul>
<li>Add
<code>&quot;go.opentelemetry.io/contrib/samplers/jaegerremote&quot;.WithSamplingStrategyFetcher</code>
which sets custom fetcher implementation. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4045">#4045</a>)</li>
<li>Add <code>&quot;go.opentelemetry.io/contrib/config&quot;</code>
package that includes configuration models generated via go-jsonschema.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4376">#4376</a>)</li>
<li>Add <code>NewSDK</code> function to
<code>&quot;go.opentelemetry.io/contrib/config&quot;</code>. The initial
implementation only returns noop providers. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4414">#4414</a>)</li>
<li>Add metrics support (No-op, OTLP and Prometheus) to
<code>go.opentelemetry.io/contrib/exporters/autoexport</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4229">#4229</a>,
<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4479">#4479</a>)</li>
<li>Add support for <code>console</code> span exporter and metrics
exporter in
<code>go.opentelemetry.io/contrib/exporters/autoexport</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4486">#4486</a>)</li>
<li>Set unit and description on all instruments in
<code>go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp</code>.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4500">#4500</a>)</li>
<li>Add metric support for <code>grpc.StatsHandler</code> in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc</code>.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4356">#4356</a>)</li>
<li>Expose the name of the scopes in all instrumentation libraries as
<code>ScopeName</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4448">#4448</a>)</li>
</ul>
<h3>Changed</h3>
<ul>
<li>Dropped compatibility testing for [Go 1.19].
The project no longer guarantees support for this version of Go. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4352">#4352</a>)</li>
<li>Upgrade dependencies of OpenTelemetry Go to use the new <a
href="https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.20.0"><code>v1.20.0</code>/<code>v0.43.0</code>
release</a>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4546">#4546</a>)</li>
<li>In <code>go.opentelemetry.io/contrib/exporters/autoexport</code>,
<code>Option</code> was renamed to <code>SpanOption</code>. The old name
is deprecated but continues to be supported as an alias. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4229">#4229</a>)</li>
</ul>
<h3>Deprecated</h3>
<ul>
<li>The interceptors (<code>UnaryClientInterceptor</code>,
<code>StreamClientInterceptor</code>,
<code>UnaryServerInterceptor</code>,
<code>StreamServerInterceptor</code>,
<code>WithInterceptorFilter</code>) are deprecated. Use stats handlers
(<code>NewClientHandler</code>, <code>NewServerHandler</code>) instead.
(<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4534">#4534</a>)</li>
</ul>
<h3>Fixed</h3>
<ul>
<li>The <code>go.opentelemetry.io/contrib/samplers/jaegerremote</code>
sampler does not panic when the default HTTP round-tripper
(<code>http.DefaultTransport</code>) is not
<code>*http.Transport</code>. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4045">#4045</a>)</li>
<li>The <code>UnaryServerInterceptor</code> in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc</code>
now sets gRPC status code correctly for the
<code>rpc.server.duration</code> metric. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4481">#4481</a>)</li>
<li>The <code>NewClientHandler</code>, <code>NewServerHandler</code> in
<code>go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc</code>
now honor <code>otelgrpc.WithMessageEvents</code> options. (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4536">#4536</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/b4b06bcdc72f96690d319705c72840c7198108e6"><code>b4b06bc</code></a>
Release v1.21.0/v0.46.0/v0.15.0/v0.1.0 (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4546">#4546</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/c1ac3039d0bb7cdf83630210f8209b7d0b95cd48"><code>c1ac303</code></a>
config: Prepare module for release (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4541">#4541</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/fe68fe96a73a70a27afad0772618d7b15b3aa124"><code>fe68fe9</code></a>
host: fix typo (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4540">#4540</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/016b46fd3137a9c72bd581de86949dafa119e983"><code>016b46f</code></a>
otelgrpc: Use net.Listen in TestStatsHandler (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4538">#4538</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/23bd4ed41fe30ae1e9a5b11b57e902743f94490b"><code>23bd4ed</code></a>
otelgrpc: Deprecate interceptors in favor of stats handlers (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4534">#4534</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/a3b16ae7ecdc805995842e4d2289cd064396dd46"><code>a3b16ae</code></a>
Expose instrumentation scope name (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4448">#4448</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/2b690297abce4af6d342091ab76f7191e000f4f0"><code>2b69029</code></a>
otelgrpc: Fix stats handlers to honor WithMessageEvents option (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4536">#4536</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/f6aeb0d909e933a7e8bf416aab1c9f0277c8aed6"><code>f6aeb0d</code></a>
otelgrpc: Stablize TestInterceptors (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4535">#4535</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/b44dfc9092b157625a5815cb437583cee663333b"><code>b44dfc9</code></a>
otelgrpc: Remove high cardinality metric attributes (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4322">#4322</a>)</li>
<li><a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/commit/2a5fe23f9705a1fa94781ccbef055c3746f7ae3d"><code>2a5fe23</code></a>
otelgrpc: Refine tests to use a net socket instead of a buffer (<a
href="https://redirect.github.com/open-telemetry/opentelemetry-go-contrib/issues/4503">#4503</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.45.0...zpages/v0.46.0">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc&package-manager=go_modules&previous-version=0.45.0&new-version=0.46.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts page](https://github.com/cerbos/cerbos/network/alerts).

</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Charith Ellawala <charith@cerbos.dev>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Charith Ellawala <charith@cerbos.dev>
  • Loading branch information
@dependabot @charithe
dependabot[bot] and charithe committed Nov 13, 2023
1 parent f2ff20d commit da82249
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 25 deletions.
12 changes: 6 additions & 6 deletions go.mod
View file
Expand Up @@ -81,16 +81,16 @@ require (
github.com/twmb/franz-go/plugin/kzap v1.1.2
go.elastic.co/ecszap v1.0.2
go.opencensus.io v0.24.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0
go.opentelemetry.io/contrib/propagators/autoprop v0.45.0
go.opentelemetry.io/contrib/propagators/b3 v1.20.0
go.opentelemetry.io/otel v1.19.0
go.opentelemetry.io/otel v1.20.0
go.opentelemetry.io/otel/bridge/opencensus v0.42.0
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0
go.opentelemetry.io/otel/sdk v1.19.0
go.opentelemetry.io/otel/trace v1.19.0
go.opentelemetry.io/otel/sdk v1.20.0
go.opentelemetry.io/otel/trace v1.20.0
go.uber.org/automaxprocs v1.5.3
go.uber.org/config v1.4.0
go.uber.org/multierr v1.11.0
Expand Down Expand Up @@ -270,15 +270,15 @@ require (
go.opentelemetry.io/contrib/propagators/jaeger v1.20.0 // indirect
go.opentelemetry.io/contrib/propagators/ot v1.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
Expand Down
23 changes: 12 additions & 11 deletions go.sum
View file
Expand Up @@ -930,8 +930,8 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M=
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q=
go.opentelemetry.io/contrib/propagators/autoprop v0.45.0 h1:FT/JCFzjzXgyp/aXkQeywnI/Tl8ZtKhvusVtZOokmFM=
Expand All @@ -944,8 +944,8 @@ go.opentelemetry.io/contrib/propagators/jaeger v1.20.0 h1:iVhNKkMIpzyZqxk8jkDU2n
go.opentelemetry.io/contrib/propagators/jaeger v1.20.0/go.mod h1:cpSABr0cm/AH/HhbJjn+AudBVUMgZWdfN3Gb+ZqxSZc=
go.opentelemetry.io/contrib/propagators/ot v1.20.0 h1:duH7mgL6VGQH7e7QEAVOFkCQXWpCb4PjTtrhdrYrJRQ=
go.opentelemetry.io/contrib/propagators/ot v1.20.0/go.mod h1:gijQzxOq0JLj9lyZhTvqjDddGV/zaNagpPIn+2r8CEI=
go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc=
go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs=
go.opentelemetry.io/otel/bridge/opencensus v0.42.0 h1:QvC+bcZkWMphWPiVqRQygMj6M0/3TOuJEO+erRA7kI8=
go.opentelemetry.io/otel/bridge/opencensus v0.42.0/go.mod h1:XJojP7g5DqYdiyArix/H9i1XzPPlIUc9dGLKtF9copI=
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=
Expand All @@ -954,14 +954,14 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZ
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I=
go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA=
go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM=
go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM=
go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0=
go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k=
go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY=
go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ=
go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
Expand Down Expand Up @@ -1218,8 +1218,9 @@ golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
Expand Down
6 changes: 2 additions & 4 deletions internal/observability/tracing/tracing.go
View file
Expand Up @@ -10,12 +10,10 @@ import (
"net/http"
"strings"

octrace "go.opencensus.io/trace"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"go.opentelemetry.io/contrib/propagators/autoprop"
otelpropb3 "go.opentelemetry.io/contrib/propagators/b3"
"go.opentelemetry.io/otel"
ocbridge "go.opentelemetry.io/otel/bridge/opencensus"
"go.opentelemetry.io/otel/exporters/jaeger" //nolint:staticcheck
otlp "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
otelprop "go.opentelemetry.io/otel/propagation"
Expand All @@ -24,6 +22,7 @@ import (
semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
"go.opentelemetry.io/otel/semconv/v1.18.0/httpconv"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/noop"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
Expand All @@ -49,7 +48,7 @@ func InitFromConf(ctx context.Context, conf Conf) error {
case otlpExporter:
return configureOTLP(ctx)
case "":
otel.SetTracerProvider(trace.NewNoopTracerProvider())
otel.SetTracerProvider(noop.NewTracerProvider())
return nil
default:
return fmt.Errorf("unknown exporter %q", conf.Exporter)
Expand Down Expand Up @@ -130,7 +129,6 @@ func configureOtel(ctx context.Context, svcName *string, exporter tracesdk.SpanE

otel.SetTracerProvider(traceProvider)
otel.SetTextMapPropagator(autoprop.NewTextMapPropagator(otelprop.TraceContext{}, otelprop.Baggage{}, otelpropb3.New()))
octrace.DefaultTracer = ocbridge.NewTracer(traceProvider.Tracer("cerbos"))

go func() {
<-ctx.Done()
Expand Down
6 changes: 2 additions & 4 deletions internal/server/server.go
View file
Expand Up @@ -450,23 +450,21 @@ func (s *Server) mkGRPCServer(log *zap.Logger, auditLog audit.Log) (*grpc.Server
grpc.ChainStreamInterceptor(
grpc_recovery.StreamServerInterceptor(),
telemetryInt.StreamServerInterceptor(),
otelgrpc.StreamServerInterceptor(),
grpc_validator.StreamServerInterceptor(validator.Validator),
grpc_logging.StreamServerInterceptor(RequestLogger(log, "Handled request")),
grpc_logging.StreamServerInterceptor(PayloadLogger(s.conf), grpc_logging.WithLogOnEvents(grpc_logging.PayloadReceived, grpc_logging.PayloadSent)),
),
grpc.ChainUnaryInterceptor(
grpc_recovery.UnaryServerInterceptor(),
telemetryInt.UnaryServerInterceptor(),
otelgrpc.UnaryServerInterceptor(),
grpc_validator.UnaryServerInterceptor(validator.Validator),
RequestMetadataUnaryServerInterceptor,
auditInterceptor,
grpc_logging.UnaryServerInterceptor(RequestLogger(log, "Handled request")),
grpc_logging.UnaryServerInterceptor(PayloadLogger(s.conf), grpc_logging.WithLogOnEvents(grpc_logging.PayloadReceived, grpc_logging.PayloadSent)),
cerbosVersionUnaryServerInterceptor,
),
grpc.StatsHandler(&ocgrpc.ServerHandler{}),
grpc.StatsHandler(otelgrpc.NewServerHandler()),
grpc.KeepaliveParams(keepalive.ServerParameters{MaxConnectionAge: s.conf.Advanced.GRPC.MaxConnectionAge}),
grpc.MaxConcurrentStreams(s.conf.Advanced.GRPC.MaxConcurrentStreams),
grpc.ConnectionTimeout(s.conf.Advanced.GRPC.ConnectionTimeout),
Expand Down Expand Up @@ -573,7 +571,7 @@ func defaultGRPCDialOpts() []grpc.DialOption {
return []grpc.DialOption{
grpc.WithUserAgent("grpc-gateway"),
grpc.WithConnectParams(grpc.ConnectParams{MinConnectTimeout: minGRPCConnectTimeout}),
grpc.WithStatsHandler(&ocgrpc.ClientHandler{}),
grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
}
}

Expand Down

0 comments on commit da82249

Please sign in to comment.