File: 0001-remove-jaeger.patch

package info (click to toggle)
mtail 3.2.24-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 7,384 kB
  • sloc: yacc: 647; makefile: 226; sh: 78; lisp: 77; awk: 17
file content (74 lines) | stat: -rw-r--r-- 2,378 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
From: =?utf-8?q?Antoine_Beaupr=C3=A9?= <anarcat@debian.org>
Date: Tue, 21 Apr 2020 16:38:35 -0400
Subject: Remove jaeger support as the library is not in debian

Forwarded: not-needed
Last-Updated: Mon, 25 Sep 2023 20:07:12 +0000
---
 cmd/mtail/main.go         |  4 ----
 internal/mtail/options.go | 19 -------------------
 2 files changed, 23 deletions(-)

diff --git a/cmd/mtail/main.go b/cmd/mtail/main.go
index ccf98a4..d0051eb 100644
--- a/cmd/mtail/main.go
+++ b/cmd/mtail/main.go
@@ -76,7 +76,6 @@ var (
 	httpInfoEndpoints    = flag.Bool("http_info_endpoint", true, "Enable info endpoints (/progz,/varz).")
 
 	// Tracing.
-	jaegerEndpoint    = flag.String("jaeger_endpoint", "", "If set, collector endpoint URL of jaeger thrift service")
 	traceSamplePeriod = flag.Int("trace_sample_period", 0, "Sample period for traces.  If non-zero, every nth trace will be sampled.")
 
 	// Deprecated.
@@ -227,9 +226,6 @@ func main() {
 		opts = append(opts, mtail.EmitMetricTimestamp)
 		eOpts = append(eOpts, exporter.EmitTimestamp())
 	}
-	if *jaegerEndpoint != "" {
-		opts = append(opts, mtail.JaegerReporter(*jaegerEndpoint))
-	}
 	store := metrics.NewStore()
 	if *expiredMetricGcTickInterval > 0 {
 		store.StartGcLoop(ctx, *expiredMetricGcTickInterval)
diff --git a/internal/mtail/options.go b/internal/mtail/options.go
index 6c353bf..a54a559 100644
--- a/internal/mtail/options.go
+++ b/internal/mtail/options.go
@@ -10,12 +10,10 @@ import (
 	"path/filepath"
 	"time"
 
-	"contrib.go.opencensus.io/exporter/jaeger"
 	"github.com/jaqx0r/mtail/internal/exporter"
 	"github.com/jaqx0r/mtail/internal/runtime"
 	"github.com/jaqx0r/mtail/internal/tailer"
 	"github.com/jaqx0r/mtail/internal/waker"
-	"go.opencensus.io/trace"
 )
 
 // Option configures mtail.Server.
@@ -246,23 +244,6 @@ var LogRuntimeErrors = &niladicOption{
 	},
 }
 
-// JaegerReporter creates a new jaeger reporter that sends to the given Jaeger endpoint address.
-type JaegerReporter string
-
-func (opt JaegerReporter) apply(_ *Server) error {
-	je, err := jaeger.NewExporter(jaeger.Options{
-		CollectorEndpoint: string(opt),
-		Process: jaeger.Process{
-			ServiceName: "mtail",
-		},
-	})
-	if err != nil {
-		return err
-	}
-	trace.RegisterExporter(je)
-	return nil
-}
-
 // MetricPushInterval sets the interval between metrics pushes to passive collectors.
 type MetricPushInterval time.Duration