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.

Sign up for GitHub

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

Jump to bottom

vParquet4: update opentelemetry-proto and add scope attrs #3649

Merged
merged 7 commits into from
May 9, 2024
Merged

vParquet4: update opentelemetry-proto and add scope attrs #3649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
196a30a
Update opentelemetry-proto submodule to v1.3.0
stoewer May 7, 2024
9df6b13
Generate proto
stoewer May 7, 2024
823416d
Populate scope attributes
stoewer May 7, 2024
a23800b
CHANGELOG.md
stoewer May 7, 2024
952cebb
Merge remote-tracking branch 'upstream/main' into vp4-update-otel-pro…
stoewer May 9, 2024
373ebcd
Mention breaking change in CHANGELOG.md
stoewer May 9, 2024
cba7aef
Run make check-fmt
stoewer May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## main / unreleased

* [ENHANCEMENT] Update OTLP and add attributes to instrumentation scope in vParquet4 [#3649](https://github.com/grafana/tempo/pull/3649) (@stoewer)
**Breaking Change** The update to OTLP 1.3.0 removes the deprecated `InstrumentationLibrary`
and `InstrumentationLibrarySpan` from the OTLP receivers
* [BUGFIX] Fix handling of regex matchers in autocomplete endpoints [#3641](https://github.com/grafana/tempo/pull/3641) (@sd2k)
* [ENHANCEMENT] Surface new labels for uninstrumented services and systems [#3543](https://github.com/grafana/tempo/pull/3543) (@t00mas)
* [FEATURE] Add TLS support for Memcached Client [#3585](https://github.com/grafana/tempo/pull/3585) (@sonisr)
Expand Down
1 change: 0 additions & 1 deletion modules/querier/external/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ func newClientWithOpts(cfg *commonConfig, opts ...option) (*Client, error) {
cfg.hedgeRequestsUpTo,
http.DefaultClient,
)

if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-proto
Open in desktop
Submodule opentelemetry-proto updated 39 files
+2 −1 .github/auto_assign.yml
+41 −0 .github/workflows/build-check.yaml
+2 −0 .gitignore
+22 −0 .markdown_link_check_config.json
+14 −0 .markdownlint.yaml
+99 −10 CHANGELOG.md
+35 −0 Makefile
+57 −18 README.md
+3 −8 RELEASING.md
+6 −0 buf.yaml
+8 −0 docs/README.md
+19 −0 docs/design-goals.md
+ − docs/img/otlp-client-server.png
+ − docs/img/otlp-concurrent.png
+ − docs/img/otlp-multi-destination.png
+ − docs/img/otlp-request-response.png
+ − docs/img/otlp-sequential.png
+99 −0 docs/requirements.md
+717 −0 docs/specification.md
+43 −0 examples/README.md
+101 −0 examples/logs.json
+107 −0 examples/metrics.json
+51 −0 examples/trace.json
+34 −0 opentelemetry/proto/collector/logs/v1/logs_service.proto
+34 −0 opentelemetry/proto/collector/metrics/v1/metrics_service.proto
+78 −0 opentelemetry/proto/collector/profiles/v1experimental/profiles_service.proto
+9 −0 opentelemetry/proto/collector/profiles/v1experimental/profiles_service_http.yaml
+34 −0 opentelemetry/proto/collector/trace/v1/trace_service.proto
+2 −2 opentelemetry/proto/collector/trace/v1/trace_service_http.yaml
+7 −13 opentelemetry/proto/common/v1/common.proto
+47 −58 opentelemetry/proto/logs/v1/logs.proto
+38 −58 opentelemetry/proto/metrics/v1/metrics.proto
+386 −0 opentelemetry/proto/profiles/v1experimental/pprofextended.proto
+191 −0 opentelemetry/proto/profiles/v1experimental/profiles.proto
+1 −0 opentelemetry/proto/resource/v1/resource.proto
+94 −70 opentelemetry/proto/trace/v1/trace.proto
+0 −78 opentelemetry/proto/trace/v1/trace_config.proto
+1,375 −0 package-lock.json
+6 −0 package.json
1 change: 0 additions & 1 deletion pkg/cache/memcached.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ func (c *Memcached) fetch(ctx context.Context, keys []string) (found []string, b
err := measureRequest(ctx, method, c.requestDuration, memcacheStatusCode, func(innerCtx context.Context) error {
var err error
items, err = c.memcache.GetMulti(keys)

if err != nil {
level.Error(c.logger).Log("msg", "Failed to get keys from memcached", "err", err)
}
Expand Down
Loading
Loading