Skip to content

Commit dca2076

Browse files
committed
Finish adding example
1 parent a098362 commit dca2076

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

internal/examples/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ require (
99
github.com/open-telemetry/opamp-go v0.1.0
1010
github.com/shirou/gopsutil v3.21.11+incompatible
1111
github.com/stretchr/testify v1.8.4
12+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
1213
go.opentelemetry.io/otel v1.24.0
1314
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0
1415
go.opentelemetry.io/otel/metric v1.24.0
@@ -19,12 +20,13 @@ require (
1920

2021
require (
2122
github.com/davecgh/go-spew v1.1.1 // indirect
23+
github.com/felixge/httpsnoop v1.0.4 // indirect
2224
github.com/fsnotify/fsnotify v1.4.9 // indirect
2325
github.com/go-logr/logr v1.4.1 // indirect
2426
github.com/go-logr/stdr v1.2.2 // indirect
2527
github.com/go-ole/go-ole v1.2.6 // indirect
26-
github.com/gorilla/websocket v1.5.1 // indirect
2728
github.com/golang/protobuf v1.5.3 // indirect
29+
github.com/gorilla/websocket v1.5.1 // indirect
2830
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
2931
github.com/mitchellh/copystructure v1.2.0 // indirect
3032
github.com/mitchellh/mapstructure v1.4.1 // indirect

internal/examples/go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
2121
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2222
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
2323
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
24+
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
25+
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
2426
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
2527
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
2628
github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
@@ -127,6 +129,8 @@ github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2bi
127129
github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
128130
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
129131
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
132+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
133+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
130134
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
131135
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
132136
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0 h1:mM8nKi6/iFQ0iqst80wDHU2ge198Ye/TfN0WBS5U24Y=

internal/examples/server/opampsrv/opampsrv.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import (
66
"net/http"
77
"os"
88

9+
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
10+
911
"github.com/open-telemetry/opamp-go/internal"
1012
"github.com/open-telemetry/opamp-go/internal/examples/server/data"
1113
"github.com/open-telemetry/opamp-go/protobufs"
1214
"github.com/open-telemetry/opamp-go/server"
1315
"github.com/open-telemetry/opamp-go/server/types"
14-
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
1516
)
1617

1718
type Server struct {
@@ -55,7 +56,7 @@ func (srv *Server) Start() {
5556
},
5657
},
5758
ListenEndpoint: "127.0.0.1:4320",
58-
HTTPMiddleware: otelhttp.NewMiddleware("HTTP POST"),
59+
HTTPMiddleware: otelhttp.NewMiddleware("HTTP opamp-go"),
5960
}
6061
tlsConfig, err := internal.CreateServerTLSConfig(
6162
"../../certs/certs/ca.cert.pem",

0 commit comments

Comments
 (0)