Skip to content

Commit

Permalink
chore: Add SSAPI to v2 manifest (#2100)
Browse files Browse the repository at this point in the history
* add ssapi to manifest, update tools

* remove errant opamp file
  • Loading branch information
dpaasman00 authored Jan 13, 2025
1 parent 5a24011 commit 1d76ff8
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 169 deletions.
9 changes: 5 additions & 4 deletions internal/tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ require (
github.com/client9/misspell v0.3.4
github.com/google/addlicense v1.1.1
github.com/mgechev/revive v1.5.0
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.114.0
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.116.0
github.com/securego/gosec/v2 v2.18.2
github.com/uw-labs/lichen v0.1.7
github.com/vektra/mockery/v2 v2.50.0
go.opentelemetry.io/collector/cmd/builder v0.114.0
go.opentelemetry.io/collector/cmd/builder v0.116.0
go.opentelemetry.io/collector/cmd/mdatagen v0.116.0
golang.org/x/tools v0.29.0
)
Expand All @@ -36,7 +36,7 @@ require (
github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gookit/color v1.5.4 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
Expand Down Expand Up @@ -68,7 +68,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/open-telemetry/opamp-go v0.15.0 // indirect
github.com/open-telemetry/opamp-go v0.17.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
Expand All @@ -93,6 +93,7 @@ require (
go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.22.0 // indirect
go.opentelemetry.io/collector/confmap v1.22.0 // indirect
go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.0 // indirect
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.0 // indirect
go.opentelemetry.io/collector/filter v0.116.0 // indirect
go.opentelemetry.io/collector/pdata v1.22.0 // indirect
Expand Down
18 changes: 10 additions & 8 deletions internal/tools/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gookit/color v1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
github.com/gookit/color v1.5.4/go.mod h1:pZJOeOS8DM43rXbp4AZo1n9zCU2qjpcRko0b6/QJi9w=
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down Expand Up @@ -141,10 +141,10 @@ github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA=
github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
github.com/open-telemetry/opamp-go v0.15.0 h1:X2TWhEsGQ8GP7Uos3Ic9v/1aFUqoECZXKS7xAF5HqsA=
github.com/open-telemetry/opamp-go v0.15.0/go.mod h1:QyPeN56JXlcZt5yG5RMdZ50Ju+zMFs1Ihy/hwHyF8Oo=
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.114.0 h1:8J07frLqZMes9uS831GMSzto78irEWsC0brh5+hLVlA=
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.114.0/go.mod h1:QskKAv19hG7O6vLS/SDBMgyPGSum6OPrRKRagcSrtGo=
github.com/open-telemetry/opamp-go v0.17.0 h1:3R4+B/6Sy8mknLBbzO3gqloqwTT02rCSRcr4ac2B124=
github.com/open-telemetry/opamp-go v0.17.0/go.mod h1:SGDhUoAx7uGutO4ENNMQla/tiSujxgZmMPJXIOPGBdk=
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.116.0 h1:wfOBoI4VCgI29GrOx6ahKh9kyCKW4Hc7jYGIIF/uCrA=
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor v0.116.0/go.mod h1:/5WfSoo3YUbVs+6ObVWbmRCkPk73rgrDscijpOdveyo=
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down Expand Up @@ -208,8 +208,8 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.opentelemetry.io/collector/cmd/builder v0.114.0 h1:8XEVWeY2kr0RN3wlUUYp8A21/+vDHxzxIksHF4R08YM=
go.opentelemetry.io/collector/cmd/builder v0.114.0/go.mod h1:Y3sf8V37dIk4zMXTqbQsnt+fhLQjeRaTgmqNHm+uKNk=
go.opentelemetry.io/collector/cmd/builder v0.116.0 h1:KVLk6qEpHdz2wSg1BasxpFLNYChRakBllhwb8/2qiOs=
go.opentelemetry.io/collector/cmd/builder v0.116.0/go.mod h1:dbzO6Gh1jW7IDLpxk1XMZXM1C3BaDRY4xppmx6cyTgM=
go.opentelemetry.io/collector/cmd/mdatagen v0.116.0 h1:TUJ3cah2B53ZbZeOiwvlzhJpYmy5y7EStkXvqp30jTY=
go.opentelemetry.io/collector/cmd/mdatagen v0.116.0/go.mod h1:jwSwViT+hLPeDycCNQMr4upI+vLFyvzGR0wZoM+gx/4=
go.opentelemetry.io/collector/component v0.116.0 h1:SQE1YeVfYCN7bw1n4hknUwJE5U/1qJL552sDhAdSlaA=
Expand All @@ -222,6 +222,8 @@ go.opentelemetry.io/collector/config/configtls v1.22.0 h1:Bu+GZMBYCufYDF72Wup+3j
go.opentelemetry.io/collector/config/configtls v1.22.0/go.mod h1:CYFyMvbf10EoWhoFG8EYyxzFy4jcIPGIRMc8/HWLNQM=
go.opentelemetry.io/collector/confmap v1.22.0 h1:ZKQzRuj5lKu+seKArAAZ1yPRroDPricaIVIREm/jr3w=
go.opentelemetry.io/collector/confmap v1.22.0/go.mod h1:Rrhs+MWoaP6AswZp+ReQ2VO9dfOfcUjdjiSHBsG+nec=
go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.0 h1:AdHaQo/GSSRLJvEFLCMHo02r+u6Ed8j0/MNz7u3noug=
go.opentelemetry.io/collector/confmap/provider/envprovider v1.22.0/go.mod h1:InKYEGFdkwz3H2q648kT6rMCFBhPvevIW9ZbWIY5QR4=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.0 h1:upFhnU8EyPp0WMR53mJIdx+UR2EGFOr+ppYKzUCY/Vg=
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.22.0/go.mod h1:FhjMWU5nf3IctX27lVZomM5SKMyRywShRsA4/rHoBe8=
go.opentelemetry.io/collector/filter v0.116.0 h1:pvN3W2JIEHxWbCLlUS1HxrRo3ZQrN4BiWyLvPFyKfvQ=
Expand Down
2 changes: 1 addition & 1 deletion manifests/minimal/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dist:
module: github.com/observiq/bindplane-otel-collector-ocb
name: observiq-distro
description: ObservIQ's minimal distro for OpenTelemetry Collector
version: "v0.0.1"

output_path: ./dist
conf_resolver:
default_uri_scheme: "env"
Expand Down
2 changes: 2 additions & 0 deletions manifests/observIQ/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,8 @@ receivers:
path: "./receiver/routereceiver"
- gomod: github.com/observiq/bindplane-otel-collector/receiver/sapnetweaverreceiver v1.68.0
path: "./receiver/sapnetweaverreceiver"
- gomod: github.com/observiq/bindplane-otel-collector/receiver/splunksearchapireceiver v1.68.0
path: "./receiver/splunksearchapireceiver"
- gomod: github.com/observiq/bindplane-otel-collector/receiver/telemetrygeneratorreceiver v1.68.0
path: "./receiver/telemetrygeneratorreceiver"
connectors:
Expand Down
156 changes: 0 additions & 156 deletions opamp/observiq/topology.go

This file was deleted.

0 comments on commit 1d76ff8

Please sign in to comment.