Skip to content

Commit

Permalink
Merge branch 'release/v1.68.0' into feat/log-volume-anomaly-processor
Browse files Browse the repository at this point in the history
  • Loading branch information
BominRahmani authored Jan 6, 2025
2 parents 3c50155 + 5f3e390 commit db965bf
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 9 deletions.
4 changes: 4 additions & 0 deletions factories/connectors.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ package factories
import (
"github.com/observiq/bindplane-otel-collector/connector/loganomalyconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector"
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
Expand All @@ -31,4 +33,6 @@ var defaultConnectors = []connector.Factory{
spanmetricsconnector.NewFactory(),
routingconnector.NewFactory(),
loganomalyconnector.NewFactory(),
roundrobinconnector.NewFactory(),
failoverconnector.NewFactory(),
}
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ require (
github.com/oklog/ulid/v2 v2.1.0
github.com/open-telemetry/opamp-go v0.17.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.116.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.116.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.116.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.116.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.116.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.116.0
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1930,6 +1930,10 @@ github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnect
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.116.0/go.mod h1:N9b/khAf5kuUDMyUK01ASwrNLEl8kP6ipJMIoHil9V0=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.116.0 h1:LkDulGYsynGY9l6YB9kmIJCLFeW/oSG9P72w5vKEH18=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.116.0/go.mod h1:ILW1/7BdsP3b4Pj5lRfZ6TgEQyMvLf4TU8PIj5cEagI=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.116.0 h1:6FzwaKJiAOIufY4T+p9Dg7z9qCpDzgg9ITF+QJgD0QI=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.116.0/go.mod h1:joR0s7m7ZDMwzr1zCJaMDNZXw+Z0s8D8cbQ+hIdaaDg=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.116.0 h1:jeZTd9bHiVf2HBZASUTJiEjHw/tDwuOdaaP4xMqTx8I=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.116.0/go.mod h1:nSMvnyKux8WG6Z67cIJLTYh2dxZDFQFv/7ttpfkWB3s=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.116.0 h1:cHtt/v5biG+5Ibc0wgf4v8GgQ5Uf1WbY+cHRao2iN8M=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.116.0/go.mod h1:Yx1mL7dh69rM6KWU/EGm+vzcKNs5e2tLst8iau1StnQ=
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.116.0 h1:p7xdOP1RH3BUeidDqyJi07HOMJ9owlQSwS5gByaDxn0=
Expand Down
6 changes: 3 additions & 3 deletions processor/topologyprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ require (
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
go.opentelemetry.io/otel/trace v1.32.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions processor/topologyprocessor/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -101,20 +101,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
Expand Down

0 comments on commit db965bf

Please sign in to comment.