Sc 34020

.github/workflows/build-and-publish.yaml

@@ -41,7 +41,7 @@ jobs:
  with:
  go-version: '^1.17.4'
 
- - run: sudo apt-get -qq -y install 
+ - run: sudo apt-get -qq -y install
 
  - name: Run GoReleaser
  uses: goreleaser/goreleaser-action@v1
@@ -72,18 +72,19 @@ jobs:
  - uses: actions/checkout@v2
  - uses: superfly/flyctl-actions@1.1
  with:
- args: deploy --app kots-lint --image-label ${GITHUB_REF:10} -e DD_AGENT_HOST=dd-agent
+ args: deploy --app kots-lint --config ./fly.toml --image-label ${GITHUB_REF:10}
  env:
  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
 
  flyio-dd-agent:
- runs-on: ubuntu-latest
- needs: flyio
+ # runs-on: ubuntu-latest
+ # needs: flyio
  if: startsWith(github.ref, 'refs/tags/v')
  steps:
+ - uses: actions/checkout@v2
+ - run: curl https://s3.amazonaws.com/apt.datadoghq.com/pool/d/da/datadog-agent_7-1_amd64.deb -o datadog-agent_7-1_amd64.deb
  - uses: superfly/flyctl-actions@1.1
  with:
- args: deploy --app dd-agent --image gcr.io/datadoghq/agent:7 -e DD_API_KEY=${{ secrets.DD_API_KEY }} -e DD_SITE="datadoghq.com" -e DD_APM_NON_LOCAL_TRAFFIC=true
+ args: deploy --config ./dd-fly.toml --app dd-agent --build-arg DD_AGENT_ARTIFACT=./datadog-agent_7-1_amd64.deb --image datadog/agent:7 -e DD_API_KEY=${{ secrets.DD_API_KEY }} -e DD_SITE="datadoghq.com" -e DD_APM_NON_LOCAL_TRAFFIC=true
  env:
  FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-

app.go

@@ -10,18 +10,14 @@ import (
  "github.com/replicatedhq/kots-lint/pkg/daemon"
  "github.com/replicatedhq/kots-lint/pkg/kots"
  "github.com/replicatedhq/kots-lint/pkg/version"
- "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+ "github.com/replicatedcom/saaskit/tracing/datadog"
  log "github.com/sirupsen/logrus"
 
 )
 
 func main() {
- tracer.Start(
- tracer.WithService("kots-lint"),
- tracer.WithServiceVersion(version.GitSHA()),
- tracer.WithAgentAddr("dd-agent.internal:8126"),
- )
- defer tracer.Stop()
+ datadog.StartTracer("kots-lint", version.GitSHA())
+ defer datadog.StopTracer()
 
  rand.Seed(time.Now().UTC().UnixNano())
 

dd-fly.toml

@@ -0,0 +1,40 @@
+# fly.toml file generated for dd-agent on 2022-05-05T11:33:31-07:00
+
+app = "dd-agent"
+
+kill_signal = "SIGINT"
+kill_timeout = 5
+processes = []
+
+[experimental]
+ allowed_public_ports = []
+ auto_rollback = true
+
+[[services]]
+ internal_port = 8126
+ processes = ["app"]
+ protocol = "tcp"
+
+ [services.concurrency]
+ hard_limit = 25
+ soft_limit = 20
+ type = "connections"
+
+ [[services.ports]]
+ force_https = true
+ handlers = ["http"]
+ port = 80
+
+ [[services.ports]]
+ handlers = ["tls", "http"]
+ port = 8126
+
+ [[services.tcp_checks]]
+ grace_period = "30s"
+ interval = "15s"
+ restart_limit = 0
+ timeout = "10s"
+
+[[statics]]
+ guest_path = "/app/public"
+ url_prefix = "/static/"

fly.toml

@@ -1,5 +1,8 @@
 app = "kots-lint"
 
+[env]
+ DD_AGENT_HOST = "sjc.dd-agent.internal"
+ USE_DATADOG_APM = true
 
 [[services]]
  internal_port = 8082

go.mod

@@ -8,16 +8,14 @@ require (
  github.com/instrumenta/kubeval v0.0.0-20190918223246-8d013ec9fc56
  github.com/mitchellh/mapstructure v1.4.2
  github.com/open-policy-agent/opa v0.34.2
- github.com/opentracing/opentracing-go v1.2.0 // indirect
- github.com/philhofer/fwd v1.1.1 // indirect
  github.com/pkg/errors v0.9.1
+ github.com/replicatedcom/saaskit v0.0.0-20220404234806-42d82ab45c31
  github.com/replicatedhq/kots v1.69.2-0.20220427202613-e7b5ac2fe43e
  github.com/sirupsen/logrus v1.8.1
  github.com/stretchr/testify v1.7.0
  github.com/tommy351/gin-cors v0.0.0-20150617141853-dc91dec6313a
  github.com/xeipuuv/gojsonschema v1.2.1-0.20200118195451-b537c054d4b4 // indirect
  go.undefinedlabs.com/scopeagent v0.1.15
- gopkg.in/DataDog/dd-trace-go.v1 v1.31.0
  gopkg.in/yaml.v2 v2.4.0
  helm.sh/helm/v3 v3.7.1
  k8s.io/client-go v0.23.1

go.sum

@@ -220,6 +220,7 @@ github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/aws/aws-sdk-go v1.38.2/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.38.45/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go v1.38.49 h1:E31vxjCe6a5I+mJLmUGaZobiWmg9KdWaud9IfceYeYQ=
 github.com/aws/aws-sdk-go v1.38.49/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
@@ -282,9 +283,11 @@ github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR
 github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/bugsnag-go v1.5.3/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/bugsnag-go v2.1.1+incompatible/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
 github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
+github.com/bugsnag/panicwrap v1.3.2/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/bytecodealliance/wasmtime-go v0.30.0 h1:WfYpr4WdqInt8m5/HvYinf+HrSEAIhItKIcth+qb1h4=
 github.com/bytecodealliance/wasmtime-go v0.30.0/go.mod h1:q320gUxqyI8yB+ZqRuaJOEnGkAnHh6WtJjMaT2CW4wI=
 github.com/c9s/goprocinfo v0.0.0-20170724085704-0010a05ce49f/go.mod h1:uEyr4WpAH4hio6LFriaPkL938XnrvLpNPmQHBdrmbIE=
@@ -1102,6 +1105,7 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.3.1/go.mod h1:2BljVx/86SuTyjE+aPYlHCTNvZrnJXghYGpNiXLBMCQ=
+github.com/johntdyer/slack-go v0.0.0-20180213144715-95fac1160b22/go.mod h1:u0Jo4f2dNlTJeeOywkM6bLwxq6gC3pZ9rEFHn3AhTdk=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
@@ -1264,6 +1268,7 @@ github.com/mattn/go-shellwords v1.0.11/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lL
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
 github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
@@ -1573,6 +1578,8 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn
 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ=
 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/replicatedcom/saaskit v0.0.0-20220404234806-42d82ab45c31 h1:omR7cHtAQ4f/8MelmsBvm2yYwr4dBXngvrIq2uD16Bg=
+github.com/replicatedcom/saaskit v0.0.0-20220404234806-42d82ab45c31/go.mod h1:ae2LAb6COZAKb9oI4bgh52xrq17Ql4lqXfPXHZpGwPQ=
 github.com/replicatedhq/kots v1.69.2-0.20220427202613-e7b5ac2fe43e h1:Z9InQR6BKsX85tWPu9laBhgn6cwRsYccJCQOwXG6u4g=
 github.com/replicatedhq/kots v1.69.2-0.20220427202613-e7b5ac2fe43e/go.mod h1:V8kilzb9/V4ieJtyPnS81QBnTP9hxH/8TDqIPb1e+tU=
 github.com/replicatedhq/kurl v0.0.0-20210414162418-8d6211901244 h1:aSORttMXeqRXgRnIS7kpRfR32c3MBkJGkZ6KoqWimhc=

pkg/daemon/daemon.go

@@ -4,22 +4,17 @@ import (
  "os"
 
  "github.com/gin-gonic/gin"
- "gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
- gintrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/gin-gonic/gin"
  "github.com/replicatedhq/kots-lint/pkg/version"
+ "github.com/replicatedcom/saaskit/tracing/datadog"
  "github.com/replicatedhq/kots-lint/pkg/handlers"
  log "github.com/sirupsen/logrus"
  cors "github.com/tommy351/gin-cors"
 )
 
 // Run is the main entry point of the kots lint.
 func Run() {
- tracer.Start(
- tracer.WithService("kots-lint"), 
- tracer.WithServiceVersion(version.GitSHA()),
- tracer.WithAgentAddr("dd-agent.internal:8126"),
- )
- defer tracer.Stop()
+ datadog.StartTracer("kots-lint", version.GitSHA())
+ defer datadog.StopTracer()
 
  debugMode := os.Getenv("DEBUG_MODE")
  if debugMode != "on" {
@@ -32,7 +27,7 @@ func Run() {
  SkipPaths: []string{"/livez"},
  }),
  gin.Recovery(),
- gintrace.Middleware("kots-lint"),
+ datadog.GinMiddleware("kots-lint"),
  )
 
  r.RedirectTrailingSlash = false