Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update opentelemetry-go monorepo to v1 (major) #705

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/go/otel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:alpine AS build
FROM golang:1.23-alpine AS build
WORKDIR /src
ENV CGO_ENABLED=0
RUN apk add --no-cache \
Expand Down
2 changes: 1 addition & 1 deletion example/go/otel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ make docker.build
From the current directory

```shell
docker-compose up --build
docker compose up --build
```

Send requests to the app:
Expand Down
54 changes: 9 additions & 45 deletions example/go/otel/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,37 +1,15 @@
version: '3.9'
services:
otel:
image: otel/opentelemetry-collector:latest
pull_policy: always
image: otel/opentelemetry-collector-contrib:0.113.0
volumes:
- ./otel.yml:/conf/otel-collector-config.yml
command: /otel --config=/conf/otel-collector-config.yml
networks:
example:
aliases:
- otel
expose:
# - "6831/udp" # Default endpoint for Jaeger thrift_compact receiver
- "14268" # Jaeger http thrift receiver
- "4317" # Default endpoint for OpenTelemetry receiver
- "9411" # Zipkin port
- "8888" # Metrics
ports:
- "55680:55680"
- "9411:9411"
# - "6831:6831/udp"
- "8888:8888"
- "14268:14268"
- ./otel.yml:/etc/otelcol/config.yaml

nginx:
image: opentracing/nginx-opentracing:edge
pull_policy: always
restart: on-failure
depends_on:
- otel
networks:
example:
aliases:
- nginx
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf
- ./jaeger-config.json:/etc/jaeger-config.json
Expand All @@ -44,35 +22,21 @@ services:
- "8082:8082"

jaeger:
image: jaegertracing/all-in-one
image: jaegertracing/all-in-one:1.62.0
environment:
- COLLECTOR_ZIPKIN_HTTP_PORT=19411
pull_policy: always
networks:
example:
aliases:
- jaeger
expose:
- "16686"
- "14250"
- LOG_LEVEL=debug
- COLLECTOR_ZIPKIN_HOST_PORT=:9411
ports:
- "16686:16686"
- "14250:14250"

app:
web:
build:
context: .
dockerfile: Dockerfile
networks:
example:
aliases:
- web
expose:
- "8080"
ports:
- "8080:8080"
environment:
OT_COLLECTOR_ADDR: otel:4317
ports:
- "8080:8080"

networks:
example: {}
31 changes: 25 additions & 6 deletions example/go/otel/go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
module github.com/opentracing-contrib/nginx-opentracing/example/go/otel

go 1.16
go 1.23.0

require (
github.com/pkg/errors v0.9.1
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.17.0
go.opentelemetry.io/otel v0.17.0
go.opentelemetry.io/otel/exporters/otlp v0.17.0
go.opentelemetry.io/otel/sdk v0.17.0
go.opentelemetry.io/otel/trace v0.17.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0
go.opentelemetry.io/otel/sdk v1.32.0
go.opentelemetry.io/otel/trace v1.32.0
)

require (
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
go.opentelemetry.io/otel/metric v1.32.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
)
Loading
Loading