aboutsummaryrefslogtreecommitdiffhomepage
path: root/modules/caddyhttp/tracing
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2022-09-16 16:55:30 -0600
committerMatthew Holt <[email protected]>2022-09-16 16:55:36 -0600
commite43b6d81782ef79f22058179d8793f40cea89556 (patch)
tree13648af23e92b26cb28c13cb12c620bf746c819c /modules/caddyhttp/tracing
parentbffc2587329ca7e1f8a28edae9b5a9bf11e2fc7c (diff)
downloadcaddy-e43b6d81782ef79f22058179d8793f40cea89556.tar.gz
caddy-e43b6d81782ef79f22058179d8793f40cea89556.zip
core: Variadic Context.Logger(); soft deprecationv2.6.0-beta.4
Ideally I'd just remove the parameter to caddy.Context.Logger(), but this would break most Caddy plugins. Instead, I'm making it variadic and marking it as partially deprecated. In the future, I might completely remove the parameter once most plugins have updated.
Diffstat (limited to 'modules/caddyhttp/tracing')
-rw-r--r--modules/caddyhttp/tracing/module.go9
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/caddyhttp/tracing/module.go b/modules/caddyhttp/tracing/module.go
index 7cce6692b..e3eb84d20 100644
--- a/modules/caddyhttp/tracing/module.go
+++ b/modules/caddyhttp/tracing/module.go
@@ -42,7 +42,7 @@ func (Tracing) CaddyModule() caddy.ModuleInfo {
// Provision implements caddy.Provisioner.
func (ot *Tracing) Provision(ctx caddy.Context) error {
- ot.logger = ctx.Logger(ot)
+ ot.logger = ctx.Logger()
var err error
ot.otel, err = newOpenTelemetryWrapper(ctx, ot.SpanName)
@@ -66,10 +66,9 @@ func (ot *Tracing) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyh
// UnmarshalCaddyfile sets up the module from Caddyfile tokens. Syntax:
//
-// tracing {
-// [span <span_name>]
-// }
-//
+// tracing {
+// [span <span_name>]
+// }
func (ot *Tracing) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
setParameter := func(d *caddyfile.Dispenser, val *string) error {
if d.NextArg() {