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.

Sign up for GitHub

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

Remove deprecated packages #302

Merged
merged 11 commits into from
Sep 15, 2023
Merged

Remove deprecated packages #302

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eed7127
Remove deprecated packages
MrAlias Sep 13, 2023
d05758b
Add change to changelog
MrAlias Sep 13, 2023
4f03869
Update kind workflow
MrAlias Sep 13, 2023
7779113
Update dependabot
MrAlias Sep 13, 2023
189732a
Update versions.yaml
MrAlias Sep 13, 2023
d6c9c3d
Merge branch 'main' into rm-dep
MrAlias Sep 13, 2023
2968c21
Update offsets output file
MrAlias Sep 13, 2023
7df5328
Update offset_results.json
MrAlias Sep 13, 2023
5de8466
Merge branch 'main' into rm-dep
MrAlias Sep 13, 2023
1464737
Merge branch 'main' into rm-dep
MrAlias Sep 14, 2023
60b54a6
Merge branch 'main' into rm-dep
MrAlias Sep 14, 2023
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
68 changes: 61 additions & 7 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: docker
directory: /offsets-tracker
directory: /examples/httpPlusdb
labels:
- dependencies
- docker
Expand All @@ -29,7 +29,7 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: docker
directory: /test/e2e/gorillamux
directory: /examples/rolldice
labels:
- dependencies
- docker
Expand All @@ -38,7 +38,34 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: docker
directory: /test/e2e/nethttp
directory: /internal/test/e2e/databasesql
labels:
- dependencies
- docker
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: docker
directory: /internal/test/e2e/gin
labels:
- dependencies
- docker
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: docker
directory: /internal/test/e2e/gorillamux
labels:
- dependencies
- docker
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: docker
directory: /internal/test/e2e/nethttp
labels:
- dependencies
- docker
Expand All @@ -56,7 +83,7 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /internal/tools
directory: /examples/httpPlusdb
labels:
- dependencies
- go
Expand All @@ -65,7 +92,7 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /offsets-tracker
directory: /examples/rolldice
labels:
- dependencies
- go
Expand All @@ -74,7 +101,7 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /test/e2e/gorillamux
directory: /internal/test/e2e/databasesql
labels:
- dependencies
- go
Expand All @@ -83,7 +110,34 @@ updates:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /test/e2e/nethttp
directory: /internal/test/e2e/gin
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /internal/test/e2e/gorillamux
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /internal/test/e2e/nethttp
labels:
- dependencies
- go
- Skip Changelog
schedule:
interval: weekly
day: sunday
- package-ecosystem: gomod
directory: /internal/tools
labels:
- dependencies
- go
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/kind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
IMG=otel-go-instrumentation:latest make docker-build
- name: Build sample app
run: |
cd test/e2e/${{ matrix.library }}
cd internal/test/e2e/${{ matrix.library }}
docker build -t sample-app:latest .
- name: Set up Helm
uses: azure/setup-helm@v3.5
Expand Down Expand Up @@ -71,8 +71,8 @@ jobs:
kubectl wait --for=condition=Complete --timeout=60s job/sample-job
- name: copy telemetry trace output
run: |
kubectl cp -c filecp default/test-opentelemetry-collector-0:tmp/trace.json ./test/e2e/${{ matrix.library }}/traces-orig.json
rm -f ./test/e2e/${{ matrix.library }}/traces.json
kubectl cp -c filecp default/test-opentelemetry-collector-0:tmp/trace.json ./internal/test/e2e/${{ matrix.library }}/traces-orig.json
rm -f ./internal/test/e2e/${{ matrix.library }}/traces.json
- name: verify output and redact to traces.json
run: |
bats ./test/e2e/${{ matrix.library }}/verify.bats
bats ./internal/test/e2e/${{ matrix.library }}/verify.bats
27 changes: 27 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,33 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http

## [Unreleased]

### Removed

- The deprecated `go.opentelemetry.io/auto/offsets-tracker` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/github.com/gorilla/mux` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/test/e2e/gorillamux` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/inject` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/errors` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/process` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/process/ptrace` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/opentelemetry` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/net/http/client` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/net/http/server` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/github.com/gin-gonic/gin` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/github.com/gorilla/mux` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/google/golang/org/grpc` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpf/google/golang/org/grpc/server` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/utils` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/context` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/allocator` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/bpffs` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/instrumentors/events` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/pkg/log` package is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/test/e2e/gin` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/test/e2e/gorillamux` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))
- The deprecated `go.opentelemetry.io/auto/test/e2e/nethttp` module is removed. ([#302](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/302))

## [v0.3.0-alpha] - 2023-09-12

### Added
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ docker-build:

.PHONY: offsets
offsets: | $(OFFSETS)
OFFSETS_OUTPUT_FILE="$(REPODIR)/pkg/inject/offset_results.json" $(OFFSETS)
OFFSETS_OUTPUT_FILE="$(REPODIR)/internal/pkg/inject/offset_results.json" $(OFFSETS)

.PHONY: docker-offsets
docker-offsets:
Expand Down
12 changes: 6 additions & 6 deletions internal/pkg/inject/offset_results.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"Header": {
"versions": {
"oldest": "1.12.0",
"newest": "1.21.0"
"newest": "1.21.1"
},
"offsets": [
{
Expand All @@ -184,7 +184,7 @@
"Method": {
"versions": {
"oldest": "1.12.0",
"newest": "1.21.0"
"newest": "1.21.1"
},
"offsets": [
{
Expand All @@ -196,7 +196,7 @@
"RemoteAddr": {
"versions": {
"oldest": "1.12.0",
"newest": "1.21.0"
"newest": "1.21.1"
},
"offsets": [
{
Expand All @@ -208,7 +208,7 @@
"URL": {
"versions": {
"oldest": "1.12.0",
"newest": "1.21.0"
"newest": "1.21.1"
},
"offsets": [
{
Expand All @@ -220,7 +220,7 @@
"ctx": {
"versions": {
"oldest": "1.12.0",
"newest": "1.21.0"
"newest": "1.21.1"
},
"offsets": [
{
Expand Down Expand Up @@ -248,7 +248,7 @@
"goid": {
"versions": {
"oldest": "1.12.0",
"newest": "1.21.0"
"newest": "1.21.1"
},
"offsets": [
{
Expand Down
1 change: 0 additions & 1 deletion offsets-tracker/.gitignore
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions offsets-tracker/Dockerfile
View file
Open in desktop

This file was deleted.

Loading