github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-31 08:15:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

go.mod: Upgrade various dependencies (#5362)

Browse Source 
* chore: Upgrade various dependencies

* Support CEL file matcher with no args

* Document `http.request.orig_uri.path.*`, reorder placeholders in docs

---------

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
This commit is contained in:
Francis Lavoie
2023-02-08 12:49:17 -05:00
committed by GitHub
parent 536c28d4dc
commit 90798f3eea
8 changed files with 156 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/caddyhttp/tracing/tracer.go
View File

@ -13,7 +13,7 @@ import (
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
"go.uber.org/zap"
)
@ -108,8 +108,8 @@ func (ot *openTelemetryWrapper) newResource(
webEngineVersion string,
) (*resource.Resource, error) {
return resource.Merge(resource.Default(), resource.NewSchemaless(
semconv.WebEngineNameKey.String(webEngineName),
semconv.WebEngineVersionKey.String(webEngineVersion),
semconv.WebEngineName(webEngineName),
semconv.WebEngineVersion(webEngineVersion),
))
}