Remove deprecated support for github.com/gorilla/mux (#303)

* Remove deprecated support for github.com/gorilla/mux * Add change to changelog
open-telemetry · Sep 14, 2023 · e11bc16 · e11bc16
1 parent 82c7468
commit e11bc16
Show file tree

Hide file tree

Showing 17 changed files with 132 additions and 921 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -19,6 +19,51 @@ updates:
     schedule:
       interval: weekly
       day: sunday
+  - package-ecosystem: docker
+    directory: /examples/httpPlusdb
+    labels:
+      - dependencies
+      - docker
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
+  - package-ecosystem: docker
+    directory: /examples/rolldice
+    labels:
+      - dependencies
+      - docker
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
+  - package-ecosystem: docker
+    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/nethttp
+    labels:
+      - dependencies
+      - docker
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
   - package-ecosystem: docker
     directory: /offsets-tracker
     labels:
@@ -28,6 +73,24 @@ updates:
     schedule:
       interval: weekly
       day: sunday
+  - package-ecosystem: docker
+    directory: /test/e2e/databasesql
+    labels:
+      - dependencies
+      - docker
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
+  - package-ecosystem: docker
+    directory: /test/e2e/gin
+    labels:
+      - dependencies
+      - docker
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
   - package-ecosystem: docker
     directory: /test/e2e/gorillamux
     labels:
@@ -55,6 +118,51 @@ updates:
     schedule:
       interval: weekly
       day: sunday
+  - package-ecosystem: gomod
+    directory: /examples/httpPlusdb
+    labels:
+      - dependencies
+      - go
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
+  - package-ecosystem: gomod
+    directory: /examples/rolldice
+    labels:
+      - dependencies
+      - go
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
+  - package-ecosystem: gomod
+    directory: /internal/test/e2e/databasesql
+    labels:
+      - dependencies
+      - go
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
+  - package-ecosystem: gomod
+    directory: /internal/test/e2e/gin
+    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:
@@ -73,6 +181,24 @@ updates:
     schedule:
       interval: weekly
       day: sunday
+  - package-ecosystem: gomod
+    directory: /test/e2e/databasesql
+    labels:
+      - dependencies
+      - go
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
+  - package-ecosystem: gomod
+    directory: /test/e2e/gin
+    labels:
+      - dependencies
+      - go
+      - Skip Changelog
+    schedule:
+      interval: weekly
+      day: sunday
   - package-ecosystem: gomod
     directory: /test/e2e/gorillamux
     labels:

diff --git a/.github/workflows/kind.yml b/.github/workflows/kind.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         k8s-version: ["v1.26.0"]
-        library: ["gorillamux", "nethttp", "gin", "databasesql"]
+        library: ["nethttp", "gin", "databasesql"]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ OpenTelemetry Go Automatic Instrumentation adheres to [Semantic Versioning](http
 
 ## [Unreleased]
 
+### Removed
+
+- The deprecated instrumentation support for `github.com/gorilla/mux` is removed. ([#303](https://github.com/open-telemetry/opentelemetry-go-instrumentation/pull/303))
+
 ## [v0.3.0-alpha] - 2023-09-12
 
 ### Added

diff --git a/Makefile b/Makefile
@@ -133,9 +133,8 @@ license-header-check:
 	           exit 1; \
 	   fi
 
-.PHONY: fixture-nethttp fixture-gorillamux fixture-gin fixture-databasesql
+.PHONY: fixture-nethttp fixture-gin fixture-databasesql
 fixture-nethttp: fixtures/nethttp
-fixture-gorillamux: fixtures/gorillamux
 fixture-gin: fixtures/gin
 fixture-databasesql: fixtures/databasesql
 fixtures/%: LIBRARY=$*

diff --git a/internal/pkg/instrumentors/bpf/github.com/gorilla/mux/bpf/probe.bpf.c b/internal/pkg/instrumentors/bpf/github.com/gorilla/mux/bpf/probe.bpf.c