Skip to content
Snippets Groups Projects
Commit 751ecf1f authored by Neil-Jocelyn Schark's avatar Neil-Jocelyn Schark
Browse files

tried first integration

parent 4d0889c8
Branches
No related tags found
1 merge request!168Draft: Resolve "Improve logging and add tracing (OpenTelemetry)"
Pipeline #213508 passed
......@@ -111,7 +111,7 @@ integration-test: generate-integration-test-certs build-images
echo "Will sleep for the quantumlayers to get ready"
sleep 25
go test -p 1 -count=1 -v ./integration-tests/code/*
docker-compose -f integration-tests/docker-compose_integration_test.yml down
# docker-compose -f integration-tests/docker-compose_integration_test.yml down
playground-start: generate-certs build-images
sudo containerlab deploy --reconfigure --topo dev_env_data/containerlab/playground.clab.yaml
......
......@@ -33,6 +33,7 @@ import (
"code.fbi.h-da.de/danet/quant/goKMS/kms/util"
pbQS "code.fbi.h-da.de/danet/quipsec/gen/go/quipsec"
"github.com/google/uuid"
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
)
type Route struct {
......@@ -242,7 +243,7 @@ func (kms *KMS) startGRPC() {
log.Fatalf("unable to generate gRPC server: %v", err)
}
interKMSServer := grpc.NewServer(grpc.Creds(gRPCTransportCreds))
interKMSServer := grpc.NewServer(grpc.Creds(gRPCTransportCreds), grpc.StatsHandler(otelgrpc.NewServerHandler()))
healthCheck := health.NewServer()
healthpb.RegisterHealthServer(interKMSServer, healthCheck)
......
......@@ -110,6 +110,9 @@ func main() {
Receivers: make(map[uuid.UUID]chan<- struct{}),
}
if err != nil {
log.Fatalf("failed to initialize OpenTelemetry: %v", err)
}
kms := kms.NewKMS(kmsId, os.Stdout, log.GetLevel(), false, kmsConfig, receiver)
// start Qkdn Manager server, if there is info about it in the config
......
package telemetry
import (
"context"
"fmt"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/sdk/trace"
)
// Init configures an OpenTelemetry exporter and trace provider.
func InitOpenTelemitry() (*trace.TracerProvider, error) {
traceExporter, err := otlptracehttp.New(context.TODO(), otlptracehttp.WithInsecure())
if err != nil {
return nil, fmt.Errorf("failed to create trace exporter: %w", err)
}
tp := trace.NewTracerProvider(
trace.WithSampler(trace.AlwaysSample()),
trace.WithBatcher(traceExporter),
)
otel.SetTracerProvider(tp)
otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
return tp, nil
}
......@@ -8,6 +8,8 @@ services:
"--kms_config",
"/tmp/kms/config/kms_1.yaml",
]
environment:
- OTEL_EXPORTER_OTLP_ENDPOINT="http://jaeger:443"
volumes:
- ./config/kms/kms_1.yaml:/tmp/kms/config/kms_1.yaml
- ../artifacts/integration-tests/ssl:/config/ssl
......@@ -25,6 +27,8 @@ services:
"--kms_config",
"/tmp/kms/config/kms_2.yaml",
]
environment:
- OTEL_EXPORTER_OTLP_ENDPOINT="http://jaeger:443"
volumes:
- ./config/kms/kms_2.yaml:/tmp/kms/config/kms_2.yaml
- ../artifacts/integration-tests/ssl:/config/ssl
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment