From 200a92203800ff3162f600cf3a442235aa74ce00 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Fri, 25 Mar 2022 08:30:39 -0700 Subject: [PATCH] Build tooling refactor (#1974) * Add license header to Makefile * Unify tooling and build targets Templatetize build and tooling targets. Add the esc generator tooling. * Refactor linting * Update default targets * Add dependabot-generate and fix dependabot-check * Refactor tests * Use upstream dbotconf * Update ci test coverage workflow * Revert to original redirection * Test current and all sub packages * Add vanity import check * Update workflows * Add vanity-import-fix and run it * Update generation * Update integration test cmds * Remove compat testing for Go 1.18 * Fix modtime for zpages resources * Add suggestion to vanity-import-check failure --- .github/dependabot.yml | 811 ++++++++---------- .github/workflows/ci.yml | 18 +- Makefile | 352 ++++---- detectors/aws/ec2/ec2.go | 2 +- detectors/aws/ec2/version.go | 2 +- detectors/aws/ecs/ecs.go | 2 +- detectors/aws/ecs/version.go | 2 +- detectors/aws/eks/detector.go | 2 +- detectors/aws/eks/version.go | 2 +- detectors/aws/lambda/detector.go | 2 +- detectors/gcp/cloud-function.go | 2 +- detectors/gcp/cloud-run.go | 2 +- detectors/gcp/gce.go | 2 +- detectors/gcp/gke.go | 2 +- detectors/gcp/version.go | 2 +- doc.go | 2 +- .../Shopify/sarama/otelsarama/consumer.go | 2 +- .../sarama/otelsarama/consumer_group.go | 2 +- .../Shopify/sarama/otelsarama/dispatcher.go | 2 +- .../Shopify/sarama/otelsarama/example/init.go | 2 +- .../Shopify/sarama/otelsarama/message.go | 2 +- .../Shopify/sarama/otelsarama/option.go | 2 +- .../Shopify/sarama/otelsarama/producer.go | 2 +- .../Shopify/sarama/otelsarama/test/doc.go | 2 +- .../Shopify/sarama/otelsarama/test/version.go | 2 +- .../Shopify/sarama/otelsarama/version.go | 2 +- .../astaxie/beego/otelbeego/beego.go | 2 +- .../astaxie/beego/otelbeego/common.go | 2 +- .../astaxie/beego/otelbeego/config.go | 2 +- .../beego/otelbeego/internal/common.go | 2 +- .../astaxie/beego/otelbeego/test/doc.go | 2 +- .../astaxie/beego/otelbeego/test/version.go | 2 +- .../astaxie/beego/otelbeego/version.go | 2 +- .../aws/aws-lambda-go/otellambda/config.go | 2 +- .../aws/aws-lambda-go/otellambda/lambda.go | 2 +- .../aws/aws-lambda-go/otellambda/test/doc.go | 2 +- .../aws/aws-lambda-go/otellambda/version.go | 2 +- .../aws-lambda-go/otellambda/wrapHandler.go | 2 +- .../otellambda/wrapLambdaHandler.go | 2 +- .../otellambda/xrayconfig/xrayconfig.go | 2 +- .../aws/aws-sdk-go-v2/otelaws/attributes.go | 2 +- .../aws/aws-sdk-go-v2/otelaws/aws.go | 2 +- .../aws/aws-sdk-go-v2/otelaws/config.go | 2 +- .../otelaws/dynamodbattributes.go | 2 +- .../aws/aws-sdk-go-v2/otelaws/test/doc.go | 2 +- .../aws/aws-sdk-go-v2/otelaws/test/version.go | 2 +- .../aws/aws-sdk-go-v2/otelaws/version.go | 2 +- .../memcache/otelmemcache/config.go | 2 +- .../memcache/otelmemcache/gomemcache.go | 2 +- .../otelmemcache/internal/attributes.go | 2 +- .../memcache/otelmemcache/test/doc.go | 2 +- .../memcache/otelmemcache/test/version.go | 2 +- .../memcache/otelmemcache/version.go | 2 +- .../emicklei/go-restful/otelrestful/config.go | 2 +- .../go-restful/otelrestful/restful.go | 2 +- .../go-restful/otelrestful/test/doc.go | 2 +- .../go-restful/otelrestful/test/version.go | 2 +- .../go-restful/otelrestful/version.go | 2 +- .../gin-gonic/gin/otelgin/gintrace.go | 2 +- .../gin-gonic/gin/otelgin/option.go | 2 +- .../gin-gonic/gin/otelgin/test/doc.go | 2 +- .../gin-gonic/gin/otelgin/test/version.go | 2 +- .../gin-gonic/gin/otelgin/version.go | 2 +- .../github.com/go-kit/kit/otelkit/config.go | 2 +- .../github.com/go-kit/kit/otelkit/endpoint.go | 2 +- .../github.com/go-kit/kit/otelkit/test/doc.go | 2 +- .../go-kit/kit/otelkit/test/version.go | 2 +- .../github.com/go-kit/kit/otelkit/version.go | 2 +- .../gocql/gocql/otelgocql/config.go | 2 +- .../github.com/gocql/gocql/otelgocql/gocql.go | 2 +- .../gocql/gocql/otelgocql/instrument.go | 2 +- .../gocql/gocql/otelgocql/internal/cass.go | 2 +- .../gocql/gocql/otelgocql/observer.go | 2 +- .../gocql/gocql/otelgocql/test/doc.go | 2 +- .../gocql/gocql/otelgocql/test/version.go | 2 +- .../gocql/gocql/otelgocql/version.go | 2 +- .../github.com/gorilla/mux/otelmux/config.go | 2 +- .../github.com/gorilla/mux/otelmux/mux.go | 2 +- .../gorilla/mux/otelmux/test/doc.go | 2 +- .../gorilla/mux/otelmux/test/version.go | 2 +- .../github.com/gorilla/mux/otelmux/version.go | 2 +- .../labstack/echo/otelecho/config.go | 2 +- .../github.com/labstack/echo/otelecho/echo.go | 2 +- .../labstack/echo/otelecho/test/doc.go | 2 +- .../labstack/echo/otelecho/test/version.go | 2 +- .../labstack/echo/otelecho/version.go | 2 +- .../mongo-driver/mongo/otelmongo/config.go | 2 +- .../mongo-driver/mongo/otelmongo/mongo.go | 2 +- .../mongo-driver/mongo/otelmongo/test/doc.go | 2 +- .../mongo/otelmongo/test/version.go | 2 +- .../mongo-driver/mongo/otelmongo/version.go | 2 +- .../grpc/otelgrpc/example/config/config.go | 2 +- .../grpc/otelgrpc/grpctrace.go | 2 +- .../grpc/otelgrpc/interceptor.go | 2 +- .../grpc/otelgrpc/internal/parse.go | 2 +- .../grpc/otelgrpc/semconv.go | 2 +- .../grpc/otelgrpc/test/doc.go | 2 +- .../grpc/otelgrpc/test/version.go | 2 +- .../grpc/otelgrpc/version.go | 2 +- .../gopkg.in/macaron.v1/otelmacaron/config.go | 2 +- .../macaron.v1/otelmacaron/macaron.go | 2 +- .../macaron.v1/otelmacaron/test/doc.go | 2 +- .../macaron.v1/otelmacaron/test/version.go | 2 +- .../macaron.v1/otelmacaron/version.go | 2 +- instrumentation/host/version.go | 2 +- .../net/http/httptrace/otelhttptrace/api.go | 2 +- .../httptrace/otelhttptrace/clienttrace.go | 2 +- .../http/httptrace/otelhttptrace/httptrace.go | 2 +- .../http/httptrace/otelhttptrace/test/doc.go | 2 +- .../httptrace/otelhttptrace/test/version.go | 2 +- .../http/httptrace/otelhttptrace/version.go | 2 +- instrumentation/net/http/otelhttp/client.go | 2 +- instrumentation/net/http/otelhttp/common.go | 2 +- instrumentation/net/http/otelhttp/config.go | 2 +- .../net/http/otelhttp/filters/filters.go | 2 +- .../net/http/otelhttp/filters/header.go | 2 +- instrumentation/net/http/otelhttp/handler.go | 2 +- instrumentation/net/http/otelhttp/labeler.go | 2 +- instrumentation/net/http/otelhttp/test/doc.go | 2 +- .../net/http/otelhttp/test/version.go | 2 +- .../net/http/otelhttp/transport.go | 2 +- instrumentation/net/http/otelhttp/version.go | 2 +- instrumentation/net/http/otelhttp/wrap.go | 2 +- instrumentation/runtime/version.go | 2 +- internal/util/testutil.go | 2 +- propagators/aws/version.go | 2 +- propagators/aws/xray/idgenerator.go | 2 +- propagators/aws/xray/propagator.go | 2 +- propagators/b3/b3_config.go | 2 +- propagators/b3/b3_propagator.go | 2 +- propagators/b3/context.go | 2 +- propagators/b3/version.go | 2 +- propagators/jaeger/context.go | 2 +- propagators/jaeger/jaeger_propagator.go | 2 +- propagators/jaeger/version.go | 2 +- propagators/opencensus/version.go | 2 +- propagators/ot/ot_propagator.go | 2 +- propagators/ot/version.go | 2 +- samplers/jaegerremote/constants.go | 2 +- .../internal/testutils/mock_agent.go | 2 +- .../internal/testutils/sampling_manager.go | 2 +- .../jaegerremote/internal/utils/http_json.go | 2 +- .../internal/utils/rate_limiter.go | 2 +- samplers/jaegerremote/sampler.go | 2 +- samplers/jaegerremote/sampler_remote.go | 2 +- .../jaegerremote/sampler_remote_options.go | 2 +- samplers/jaegerremote/version.go | 2 +- tools/go.mod | 3 + tools/go.sum | 12 +- tools/tools.go | 5 +- tools/version.go | 2 +- zpages/boundaries.go | 2 +- zpages/bucket.go | 2 +- zpages/internal/gen.go | 4 +- zpages/internal/resources.go | 22 +- zpages/spanprocessor.go | 2 +- zpages/templates.go | 2 +- zpages/tracez.go | 2 +- zpages/version.go | 2 +- 159 files changed, 745 insertions(+), 784 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cac9eb7fa9e..34294b9beec 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,743 +1,624 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - +# File generated by dbotconf; DO NOT EDIT. version: 2 updates: - - - package-ecosystem: "github-actions" - # Workflow files stored in the - # default location of `.github/workflows` - directory: "/" + - package-ecosystem: github-actions + directory: / labels: - dependencies - actions - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: / labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/detectors/aws/eks" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /detectors/aws/ec2 labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/detectors/aws/lambda" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /detectors/aws/ecs labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/detectors/aws/ec2" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /detectors/aws/eks labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/detectors/aws/ecs" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /detectors/aws/lambda labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/detectors/gcp" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /detectors/gcp labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/exporters/metric/cortex" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/Shopify/sarama/otelsarama labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/exporters/metric/cortex/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/Shopify/sarama/otelsarama/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/exporters/metric/cortex/utils" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/Shopify/sarama/otelsarama/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/exporters/metric/datadog" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/astaxie/beego/otelbeego labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/exporters/metric/dogstatsd" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/astaxie/beego/otelbeego/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/astaxie/beego/otelbeego" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/astaxie/beego/otelbeego/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/astaxie/beego/otelbeego/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/aws/aws-lambda-go/otellambda labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/astaxie/beego/otelbeego/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/aws/aws-lambda-go/otellambda/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/aws/aws-lambda-go/otellambda/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/aws/aws-sdk-go-v2/otelaws labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/aws/aws-lambda-go/otellambda" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/aws/aws-lambda-go/otellambda/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/aws/aws-lambda-go/otellambda/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/emicklei/go-restful/otelrestful labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/emicklei/go-restful/otelrestful/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/emicklei/go-restful/otelrestful" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/emicklei/go-restful/otelrestful/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/emicklei/go-restful/otelrestful/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gin-gonic/gin/otelgin labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/emicklei/go-restful/otelrestful/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gin-gonic/gin/otelgin/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gin-gonic/gin/otelgin" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gin-gonic/gin/otelgin/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gin-gonic/gin/otelgin/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/go-kit/kit/otelkit labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gin-gonic/gin/otelgin/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/go-kit/kit/otelkit/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gocql/gocql/otelgocql" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/go-kit/kit/otelkit/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gocql/gocql/otelgocql/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gocql/gocql/otelgocql labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gocql/gocql/otelgocql/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gocql/gocql/otelgocql/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gorilla/mux/otelmux" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gocql/gocql/otelgocql/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gorilla/mux/otelmux/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gorilla/mux/otelmux labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/gorilla/mux/otelmux/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gorilla/mux/otelmux/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/labstack/echo/otelecho" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/gorilla/mux/otelmux/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/labstack/echo/otelecho/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/labstack/echo/otelecho labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/labstack/echo/otelecho/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/labstack/echo/otelecho/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/Shopify/sarama/otelsarama" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/github.com/labstack/echo/otelecho/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/Shopify/sarama/otelsarama/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/Shopify/sarama/otelsarama/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/google.golang.org/grpc/otelgrpc labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/google.golang.org/grpc/otelgrpc/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/google.golang.org/grpc/otelgrpc" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/google.golang.org/grpc/otelgrpc/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/google.golang.org/grpc/otelgrpc/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/gopkg.in/macaron.v1/otelmacaron labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/google.golang.org/grpc/otelgrpc/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/gopkg.in/macaron.v1/otelmacaron/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/gopkg.in/macaron.v1/otelmacaron" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/gopkg.in/macaron.v1/otelmacaron/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/gopkg.in/macaron.v1/otelmacaron/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/host labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/gopkg.in/macaron.v1/otelmacaron/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/host/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/host" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/net/http/httptrace/otelhttptrace labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/host/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/net/http/httptrace/otelhttptrace/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/net/http/otelhttp" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/net/http/httptrace/otelhttptrace/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/net/http/otelhttp/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/net/http/otelhttp labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/net/http/otelhttp/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/net/http/otelhttp/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/net/http/httptrace/otelhttptrace" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/net/http/otelhttp/test labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/net/http/httptrace/otelhttptrace/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/runtime labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/net/http/httptrace/otelhttptrace/test" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /instrumentation/runtime/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/runtime" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /propagators/aws labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/runtime/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /propagators/b3 labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/propagators/aws" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /propagators/jaeger labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/propagators/b3" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /propagators/opencensus labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/propagators/jaeger" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /propagators/opencensus/examples labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/propagators/opencensus" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /propagators/ot labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/propagators/opencensus/examples" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /samplers/jaegerremote labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/propagators/ot" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /samplers/jaegerremote/example labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - package-ecosystem: "gomod" - directory: "/samplers/jaegerremote" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /tools labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - package-ecosystem: "gomod" - directory: "/samplers/jaegerremote/example" + interval: weekly + day: sunday + - package-ecosystem: gomod + directory: /zpages labels: - dependencies - go - - "Skip Changelog" + - Skip Changelog schedule: - interval: "weekly" - day: "sunday" - - package-ecosystem: "gomod" - directory: "/tools" - labels: - - dependencies - - go - - "Skip Changelog" - schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/go-kit/kit/otelkit" - labels: - - dependencies - - go - - "Skip Changelog" - schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/go-kit/kit/otelkit/example" - labels: - - dependencies - - go - - "Skip Changelog" - schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/instrumentation/github.com/go-kit/kit/otelkit/test" - labels: - - dependencies - - go - - "Skip Changelog" - schedule: - interval: "weekly" - day: "sunday" - - - package-ecosystem: "gomod" - directory: "/zpages" - labels: - - dependencies - - go - - "Skip Changelog" - schedule: - interval: "weekly" - day: "sunday" + interval: weekly + day: sunday diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68c61961f4c..cc87d4e4e82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,9 +38,9 @@ jobs: path: ~/.tools key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('./internal/tools/**') }} - name: Run linters - run: make dependabot-check license-check lint + run: make dependabot-check license-check lint vanity-import-check - name: Build - run: make generate build + run: make build - name: Check clean repository run: make check-clean-work-tree @@ -65,7 +65,7 @@ jobs: path: ~/go/pkg/mod key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }} - name: Run tests with race detector - run: make test + run: make test-race test-coverage: runs-on: ubuntu-latest @@ -89,9 +89,11 @@ jobs: key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/go.sum') }} - name: Run coverage tests run: | - make test-with-coverage + make test-coverage mkdir $TEST_RESULTS - cp coverage.{txt,html} $TEST_RESULTS + cp coverage.out $TEST_RESULTS + cp coverage.txt $TEST_RESULTS + cp coverage.html $TEST_RESULTS - name: Upload coverage report uses: codecov/codecov-action@v2.1.0 with: @@ -101,8 +103,8 @@ jobs: - name: Store coverage test output uses: actions/upload-artifact@v2 with: - name: opentelemetry-go-test-output - path: ${{ env.TEST_RESULTS }} + name: opentelemetry-go-contrib-test-output + path: ${{ env.TEST_RESULTS }} compatibility-test: strategy: @@ -187,5 +189,5 @@ jobs: - name: Store coverage test output uses: actions/upload-artifact@v2 with: - name: opentelemetry-go-test-output + name: opentelemetry-go-contrib-test-output path: ${{ env.TEST_RESULTS }} diff --git a/Makefile b/Makefile index 58c69203272..00e88fee402 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,22 @@ +# Copyright The OpenTelemetry Authors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + TOOLS_MOD_DIR := ./tools -# All source code and documents. Used in spell check. ALL_DOCS := $(shell find . -name '*.md' -type f | sort) -# All directories with go.mod files related to opentelemetry library. Used for building, testing and linting. -ALL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)) +ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort) +OTEL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(ALL_GO_MOD_DIRS)) ALL_COVERAGE_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | egrep -v '^./example|^$(TOOLS_MOD_DIR)' | sort) # URLs to check if all contrib entries exist in the registry. @@ -11,154 +24,112 @@ REGISTRY_BASE_URL = https://raw.githubusercontent.com/open-telemetry/opentelemet CONTRIB_REPO_URL = https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main GO = go -GOTEST_MIN = $(GO) test -v -timeout 30s -GOTEST = $(GOTEST_MIN) -race -GOTEST_WITH_COVERAGE = $(GOTEST) -coverprofile=coverage.out -covermode=atomic +TIMEOUT = 60 .DEFAULT_GOAL := precommit -.PHONY: precommit +.PHONY: precommit ci +precommit: dependabot-generate license-check misspell go-mod-tidy vanity-import-fix golangci-lint-fix test-default +ci: dependabot-check license-check lint vanity-import-check build test-default check-clean-work-tree test-coverage -TOOLS_DIR := $(abspath ./.tools) +# Tools -$(TOOLS_DIR)/golangci-lint: $(TOOLS_MOD_DIR)/go.mod $(TOOLS_MOD_DIR)/go.sum $(TOOLS_MOD_DIR)/tools.go - cd $(TOOLS_MOD_DIR) && \ - $(GO) build -o $(TOOLS_DIR)/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint +.PHONY: tools -$(TOOLS_DIR)/misspell: $(TOOLS_MOD_DIR)/go.mod $(TOOLS_MOD_DIR)/go.sum $(TOOLS_MOD_DIR)/tools.go - cd $(TOOLS_MOD_DIR) && \ - $(GO) build -o $(TOOLS_DIR)/misspell github.com/client9/misspell/cmd/misspell +TOOLS = $(CURDIR)/.tools -$(TOOLS_DIR)/gocovmerge: $(TOOLS_MOD_DIR)/go.mod $(TOOLS_MOD_DIR)/go.sum $(TOOLS_MOD_DIR)/tools.go +$(TOOLS): + @mkdir -p $@ +$(TOOLS)/%: | $(TOOLS) cd $(TOOLS_MOD_DIR) && \ - $(GO) build -o $(TOOLS_DIR)/gocovmerge github.com/wadey/gocovmerge + $(GO) build -o $@ $(PACKAGE) -$(TOOLS_DIR)/stringer: $(TOOLS_MOD_DIR)/go.mod $(TOOLS_MOD_DIR)/go.sum $(TOOLS_MOD_DIR)/tools.go - cd $(TOOLS_MOD_DIR) && \ - $(GO) build -o $(TOOLS_DIR)/stringer golang.org/x/tools/cmd/stringer +GOLANGCI_LINT = $(TOOLS)/golangci-lint +$(GOLANGCI_LINT): PACKAGE=github.com/golangci/golangci-lint/cmd/golangci-lint -MULTIMOD=$(TOOLS_DIR)/multimod -$(TOOLS_DIR)/multimod: $(TOOLS_MOD_DIR)/go.mod $(TOOLS_MOD_DIR)/go.sum $(TOOLS_MOD_DIR)/tools.go - cd $(TOOLS_MOD_DIR) && \ - $(GO) build -o $(TOOLS_DIR)/multimod go.opentelemetry.io/build-tools/multimod - -precommit: dependabot-check license-check generate lint build test - -.PHONY: test-with-coverage -test-with-coverage: $(TOOLS_DIR)/gocovmerge - set -e; \ - printf "" > coverage.txt; \ - for dir in $(ALL_COVERAGE_MOD_DIRS); do \ - CMD="$(GOTEST_WITH_COVERAGE)"; \ - echo "$$dir" | \ - grep -q 'test$$' && \ - CMD="$$CMD -coverpkg=go.opentelemetry.io/contrib/$$( dirname "$$dir" | sed -e "s/^\.\///g" )/..."; \ - echo "$$CMD $$dir/..."; \ - (cd "$$dir" && \ - $$CMD ./... && \ - $(GO) tool cover -html=coverage.out -o coverage.html); \ - done; \ - $(TOOLS_DIR)/gocovmerge $$(find . -name coverage.out) > coverage.txt - -.PHONY: ci -ci: precommit check-clean-work-tree test-with-coverage +MISSPELL = $(TOOLS)/misspell +$(MISSPELL): PACKAGE=github.com/client9/misspell/cmd/misspell -.PHONY: test-gocql -test-gocql: - @if ./tools/should_build.sh gocql; then \ - set -e; \ - docker run --name cass-integ --rm -p 9042:9042 -d cassandra:3; \ - CMD=cassandra IMG_NAME=cass-integ ./tools/wait.sh; \ - (cd instrumentation/github.com/gocql/gocql/otelgocql/test/ && \ - $(GOTEST_WITH_COVERAGE) -coverpkg=go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql/... ./... && \ - $(GO) tool cover -html=coverage.out -o coverage.html); \ - cp ./instrumentation/github.com/gocql/gocql/otelgocql/test/coverage.out ./; \ - docker stop cass-integ; \ - fi +GOCOVMERGE = $(TOOLS)/gocovmerge +$(GOCOVMERGE): PACKAGE=github.com/wadey/gocovmerge -.PHONY: test-mongo-driver -test-mongo-driver: - @if ./tools/should_build.sh mongo-driver; then \ - set -e; \ - docker run --name mongo-integ --rm -p 27017:27017 -d mongo; \ - CMD=mongo IMG_NAME=mongo-integ ./tools/wait.sh; \ - (cd instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test && \ - $(GOTEST_WITH_COVERAGE) -coverpkg=go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/... ./... && \ - $(GO) tool cover -html=coverage.out -o coverage.html); \ - cp ./instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/coverage.out ./; \ - docker stop mongo-integ; \ - fi +ESC = $(TOOLS)/esc +$(ESC): PACKAGE=github.com/mjibson/esc -.PHONY: test-gomemcache -test-gomemcache: - @if ./tools/should_build.sh gomemcache; then \ - set -e; \ - docker run --name gomemcache-integ --rm -p 11211:11211 -d memcached; \ - CMD=gomemcache IMG_NAME=gomemcache-integ ./tools/wait.sh; \ - (cd instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test && \ - $(GOTEST_WITH_COVERAGE) -coverpkg=go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/... ./... && \ - $(GO) tool cover -html=coverage.out -o coverage.html); \ - docker stop gomemcache-integ ; \ - cp ./instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/coverage.out ./; \ - fi +STRINGER = $(TOOLS)/stringer +$(STRINGER): PACKAGE=golang.org/x/tools/cmd/stringer -.PHONY: check-clean-work-tree -check-clean-work-tree: - @if ! git diff --quiet; then \ - echo; \ - echo 'Working tree is not clean, did you forget to run "make precommit"?'; \ - echo; \ - git status; \ - exit 1; \ - fi +PORTO = $(TOOLS)/porto +$(TOOLS)/porto: PACKAGE=github.com/jcchavezs/porto/cmd/porto + +MULTIMOD = $(TOOLS)/multimod +$(MULTIMOD): PACKAGE=go.opentelemetry.io/build-tools/multimod + +DBOTCONF = $(TOOLS)/dbotconf +$(TOOLS)/dbotconf: PACKAGE=go.opentelemetry.io/build-tools/dbotconf + +tools: $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(ESC) $(PORTO) $(MULTIMOD) $(DBOTCONF) + +# Build + +.PHONY: generate build + +generate: $(OTEL_GO_MOD_DIRS:%=generate/%) +generate/%: DIR=$* +generate/%: | $(STRINGER) $(ESC) + @echo "$(GO) generate $(DIR)/..." \ + && cd $(DIR) \ + && PATH="$(TOOLS):$${PATH}" $(GO) generate ./... + +build: generate $(OTEL_GO_MOD_DIRS:%=build/%) $(OTEL_GO_MOD_DIRS:%=build-tests/%) +build/%: DIR=$* +build/%: + @echo "$(GO) build $(DIR)/..." \ + && cd $(DIR) \ + && $(GO) build ./... + +build-tests/%: DIR=$* +build-tests/%: + @echo "$(GO) build tests $(DIR)/..." \ + && cd $(DIR) \ + && $(GO) list ./... \ + | grep -v third_party \ + | xargs $(GO) test -vet=off -run xxxxxMatchNothingxxxxx >/dev/null + +# Linting + +.PHONY: golangci-lint golangci-lint-fix +golangci-lint-fix: ARGS=--fix +golangci-lint-fix: golangci-lint +golangci-lint: $(OTEL_GO_MOD_DIRS:%=golangci-lint/%) +golangci-lint/%: DIR=$* +golangci-lint/%: | $(GOLANGCI_LINT) + @echo 'golangci-lint $(if $(ARGS),$(ARGS) ,)$(DIR)' \ + && cd $(DIR) \ + && $(GOLANGCI_LINT) run --allow-serial-runners $(ARGS) -.PHONY: build -build: - # TODO: Fix this on windows. - set -e; for dir in $(ALL_GO_MOD_DIRS); do \ - echo "compiling all packages in $${dir}"; \ - (cd "$${dir}" && \ - $(GO) build ./... && \ - $(GO) test -run xxxxxMatchNothingxxxxx ./... >/dev/null); \ - done - -.PHONY: test -test: - set -e; for dir in $(ALL_GO_MOD_DIRS); do \ - echo "$(GO) test ./... + race in $${dir}"; \ - (cd "$${dir}" && \ - $(GOTEST) ./...); \ - done - -.PHONY: test-short -test-short: - set -e; for dir in $(ALL_GO_MOD_DIRS); do \ - echo "$(GO) test ./... + race in $${dir}"; \ - (cd "$${dir}" && \ - $(GOTEST_MIN) -short ./...); \ - done +.PHONY: go-mod-tidy +go-mod-tidy: $(ALL_GO_MOD_DIRS:%=go-mod-tidy/%) +go-mod-tidy/%: DIR=$* +go-mod-tidy/%: + @echo "$(GO) mod tidy in $(DIR)" \ + && cd $(DIR) \ + && $(GO) mod tidy + +.PHONY: misspell +misspell: | $(MISSPELL) + @$(MISSPELL) -w $(ALL_DOCS) + +.PHONY: vanity-import-check +vanity-import-check: | $(PORTO) + @$(PORTO) --include-internal -l . || echo "(run: make vanity-import-fix)" + +.PHONY: vanity-import-fix +vanity-import-fix: | $(PORTO) + @$(PORTO) --include-internal -w . .PHONY: lint -lint: $(TOOLS_DIR)/golangci-lint $(TOOLS_DIR)/misspell lint-modules - set -e; for dir in $(ALL_GO_MOD_DIRS); do \ - echo "golangci-lint in $${dir}"; \ - (cd "$${dir}" && \ - $(TOOLS_DIR)/golangci-lint run --fix && \ - $(TOOLS_DIR)/golangci-lint run); \ - done - $(TOOLS_DIR)/misspell -w $(ALL_DOCS) - -.PHONY: lint-modules -lint-modules: - set -e; for dir in $(ALL_GO_MOD_DIRS) $(TOOLS_MOD_DIR); do \ - echo "$(GO) mod tidy in $${dir}"; \ - (cd "$${dir}" && \ - $(GO) mod tidy); \ - done - -.PHONY: generate -generate: $(TOOLS_DIR)/stringer - PATH="$(TOOLS_DIR):$${PATH}" $(GO) generate ./... +lint: go-mod-tidy golangci-lint misspell .PHONY: license-check license-check: @@ -193,19 +164,112 @@ registry-links-check: echo "WARNING: registry link check failed for the following packages:"; echo "$${checkRes}"; \ fi +DEPENDABOT_CONFIG = .github/dependabot.yml .PHONY: dependabot-check -dependabot-check: - @result=$$( \ - for f in $$( find . -type f -name go.mod -exec dirname {} \; | sed 's/^.\/\?/\//' ); \ - do grep -q "$$f" .github/dependabot.yml \ - || echo "$$f"; \ - done; \ - ); \ - if [ -n "$$result" ]; then \ - echo "missing go.mod dependabot check:"; echo "$$result"; \ - exit 1; \ +dependabot-check: | $(DBOTCONF) + @$(DBOTCONF) verify $(DEPENDABOT_CONFIG) || echo "(run: make dependabot-generate)" + +.PHONY: dependabot-generate +dependabot-generate: | $(DBOTCONF) + @$(DBOTCONF) generate > $(DEPENDABOT_CONFIG) + +.PHONY: check-clean-work-tree +check-clean-work-tree: + @if ! git diff --quiet; then \ + echo; \ + echo 'Working tree is not clean, did you forget to run "make precommit"?'; \ + echo; \ + git status; \ + exit 1; \ fi +# Tests + +TEST_TARGETS := test-default test-bench test-short test-verbose test-race +.PHONY: $(TEST_TARGETS) test +test-default test-race: ARGS=-race +test-bench: ARGS=-run=xxxxxMatchNothingxxxxx -test.benchtime=1ms -bench=. +test-short: ARGS=-short +test-verbose: ARGS=-v +$(TEST_TARGETS): test +test: $(OTEL_GO_MOD_DIRS:%=test/%) +test/%: DIR=$* +test/%: + @echo "$(GO) test -timeout $(TIMEOUT)s $(ARGS) $(DIR)/..." \ + && cd $(DIR) \ + && $(GO) test -timeout $(TIMEOUT)s $(ARGS) ./... + +COVERAGE_MODE = atomic +COVERAGE_PROFILE = coverage.out +.PHONY: test-coverage +test-coverage: $(ALL_COVERAGE_MOD_DIRS:%=test-coverage/%) | $(GOCOVMERGE) + @printf "" > coverage.txt \ + && $(GOCOVMERGE) $$(find . -name $(COVERAGE_PROFILE)) > coverage.txt + +test-coverage/%: DIR=$* +test-coverage/%: + @set -e; \ + CMD="$(GO) test -race -covermode=$(COVERAGE_MODE) -coverprofile=$(COVERAGE_PROFILE)"; \ + echo "$(DIR)" | grep -q 'test$$' \ + && CMD="$$CMD -coverpkg=go.opentelemetry.io/contrib/$$( dirname "$(DIR)" | sed -e "s/^\.\///g" )/..."; \ + echo "$$CMD $(DIR)/..."; \ + cd "$(DIR)" \ + && $$CMD ./... \ + && $(GO) tool cover -html=coverage.out -o coverage.html; + +.PHONY: test-gocql +test-gocql: + @if ./tools/should_build.sh gocql; then \ + set -e; \ + docker run --name cass-integ --rm -p 9042:9042 -d cassandra:3; \ + CMD=cassandra IMG_NAME=cass-integ ./tools/wait.sh; \ + (cd instrumentation/github.com/gocql/gocql/otelgocql/test/ && \ + $(GO) test \ + -covermode=$(COVERAGE_MODE) \ + -coverprofile=$(COVERAGE_PROFILE) \ + -coverpkg=go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql/... \ + ./... \ + && $(GO) tool cover -html=$(COVERAGE_PROFILE) -o coverage.html); \ + cp ./instrumentation/github.com/gocql/gocql/otelgocql/test/coverage.out ./; \ + docker stop cass-integ; \ + fi + +.PHONY: test-mongo-driver +test-mongo-driver: + @if ./tools/should_build.sh mongo-driver; then \ + set -e; \ + docker run --name mongo-integ --rm -p 27017:27017 -d mongo; \ + CMD=mongo IMG_NAME=mongo-integ ./tools/wait.sh; \ + (cd instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test && \ + $(GO) test \ + -covermode=$(COVERAGE_MODE) \ + -coverprofile=$(COVERAGE_PROFILE) \ + -coverpkg=go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/... \ + ./... \ + && $(GO) tool cover -html=$(COVERAGE_PROFILE) -o coverage.html); \ + cp ./instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/coverage.out ./; \ + docker stop mongo-integ; \ + fi + +.PHONY: test-gomemcache +test-gomemcache: + @if ./tools/should_build.sh gomemcache; then \ + set -e; \ + docker run --name gomemcache-integ --rm -p 11211:11211 -d memcached; \ + CMD=gomemcache IMG_NAME=gomemcache-integ ./tools/wait.sh; \ + (cd instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test && \ + $(GO) test \ + -covermode=$(COVERAGE_MODE) \ + -coverprofile=$(COVERAGE_PROFILE) \ + -coverpkg=go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/... \ + ./... \ + && $(GO) tool cover -html=$(COVERAGE_PROFILE) -o coverage.html); \ + docker stop gomemcache-integ ; \ + cp ./instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/coverage.out ./; \ + fi + +# Releasing + COREPATH ?= "../opentelemetry-go" .PHONY: sync-core sync-core: | $(MULTIMOD) diff --git a/detectors/aws/ec2/ec2.go b/detectors/aws/ec2/ec2.go index e3d72160e99..05488818093 100644 --- a/detectors/aws/ec2/ec2.go +++ b/detectors/aws/ec2/ec2.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ec2 +package ec2 // import "go.opentelemetry.io/contrib/detectors/aws/ec2" import ( "context" diff --git a/detectors/aws/ec2/version.go b/detectors/aws/ec2/version.go index cab506a9f8c..6bafe95a64a 100644 --- a/detectors/aws/ec2/version.go +++ b/detectors/aws/ec2/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ec2 +package ec2 // import "go.opentelemetry.io/contrib/detectors/aws/ec2" // Version is the current release version of the EC2 resource detector. func Version() string { diff --git a/detectors/aws/ecs/ecs.go b/detectors/aws/ecs/ecs.go index 97a619e37a9..4c3863ca6c0 100644 --- a/detectors/aws/ecs/ecs.go +++ b/detectors/aws/ecs/ecs.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ecs +package ecs // import "go.opentelemetry.io/contrib/detectors/aws/ecs" import ( "context" diff --git a/detectors/aws/ecs/version.go b/detectors/aws/ecs/version.go index ce0f59afe41..ef6d7c35573 100644 --- a/detectors/aws/ecs/version.go +++ b/detectors/aws/ecs/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ecs +package ecs // import "go.opentelemetry.io/contrib/detectors/aws/ecs" // Version is the current release version of the ECS resource detector. func Version() string { diff --git a/detectors/aws/eks/detector.go b/detectors/aws/eks/detector.go index fd5978b9dac..bed2322ffa5 100644 --- a/detectors/aws/eks/detector.go +++ b/detectors/aws/eks/detector.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package eks +package eks // import "go.opentelemetry.io/contrib/detectors/aws/eks" import ( "context" diff --git a/detectors/aws/eks/version.go b/detectors/aws/eks/version.go index ed23baec519..81933c9f711 100644 --- a/detectors/aws/eks/version.go +++ b/detectors/aws/eks/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package eks +package eks // import "go.opentelemetry.io/contrib/detectors/aws/eks" // Version is the current release version of the EKS resource detector. func Version() string { diff --git a/detectors/aws/lambda/detector.go b/detectors/aws/lambda/detector.go index 2148c984bb9..8d931718945 100644 --- a/detectors/aws/lambda/detector.go +++ b/detectors/aws/lambda/detector.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package lambda +package lambda // import "go.opentelemetry.io/contrib/detectors/aws/lambda" import ( "context" diff --git a/detectors/gcp/cloud-function.go b/detectors/gcp/cloud-function.go index cd6436eb790..f3ae46967b2 100644 --- a/detectors/gcp/cloud-function.go +++ b/detectors/gcp/cloud-function.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package gcp +package gcp // import "go.opentelemetry.io/contrib/detectors/gcp" import ( "context" diff --git a/detectors/gcp/cloud-run.go b/detectors/gcp/cloud-run.go index 527ec9ce561..23f383f63a1 100644 --- a/detectors/gcp/cloud-run.go +++ b/detectors/gcp/cloud-run.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package gcp +package gcp // import "go.opentelemetry.io/contrib/detectors/gcp" import ( "context" diff --git a/detectors/gcp/gce.go b/detectors/gcp/gce.go index a950155e656..a5240c17ab6 100644 --- a/detectors/gcp/gce.go +++ b/detectors/gcp/gce.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package gcp +package gcp // import "go.opentelemetry.io/contrib/detectors/gcp" import ( "context" diff --git a/detectors/gcp/gke.go b/detectors/gcp/gke.go index a413ba6a092..f83e11cc697 100644 --- a/detectors/gcp/gke.go +++ b/detectors/gcp/gke.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package gcp +package gcp // import "go.opentelemetry.io/contrib/detectors/gcp" import ( "context" diff --git a/detectors/gcp/version.go b/detectors/gcp/version.go index 6891aec5e17..0e89d555aad 100644 --- a/detectors/gcp/version.go +++ b/detectors/gcp/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package gcp +package gcp // import "go.opentelemetry.io/contrib/detectors/gcp" // Version is the current release version of the GCP resource detector. func Version() string { diff --git a/doc.go b/doc.go index 6c55ff6a2b6..97c245144a0 100644 --- a/doc.go +++ b/doc.go @@ -17,4 +17,4 @@ // implementations for trace and metric exporters for third-party // collectors, and submodules in the instrumentation directory provide the // instrumentation for the popular go libraries. -package contrib +package contrib // import "go.opentelemetry.io/contrib" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/consumer.go b/instrumentation/github.com/Shopify/sarama/otelsarama/consumer.go index 37395f3984a..1c295e18205 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/consumer.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/consumer.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelsarama +package otelsarama // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" import ( "github.com/Shopify/sarama" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/consumer_group.go b/instrumentation/github.com/Shopify/sarama/otelsarama/consumer_group.go index 0653f2f25b5..8f4a4e39de7 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/consumer_group.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/consumer_group.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelsarama +package otelsarama // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" import ( "github.com/Shopify/sarama" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go b/instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go index 47b272aae64..405475f9dd2 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/dispatcher.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelsarama +package otelsarama // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" import ( "context" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/example/init.go b/instrumentation/github.com/Shopify/sarama/otelsarama/example/init.go index b69db91984c..731bbd56f62 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/example/init.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/example/init.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package example +package example // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/example" import ( "log" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/message.go b/instrumentation/github.com/Shopify/sarama/otelsarama/message.go index 66e39acb5ad..a38e45a6df1 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/message.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/message.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelsarama +package otelsarama // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" import ( "github.com/Shopify/sarama" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/option.go b/instrumentation/github.com/Shopify/sarama/otelsarama/option.go index 4d7b093c1e5..b0a1abaed3f 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/option.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/option.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelsarama +package otelsarama // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" import ( "go.opentelemetry.io/otel" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/producer.go b/instrumentation/github.com/Shopify/sarama/otelsarama/producer.go index 0e5f2a03cb1..2a636d061c2 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/producer.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/producer.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelsarama +package otelsarama // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" import ( "context" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/test/doc.go b/instrumentation/github.com/Shopify/sarama/otelsarama/test/doc.go index 48e5ece7091..e295537e761 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/test/doc.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/test" diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/test/version.go b/instrumentation/github.com/Shopify/sarama/otelsarama/test/version.go index a7881332c74..553f77d3b82 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/test/version.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama/test" // Version is the current release version of the sarama instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/Shopify/sarama/otelsarama/version.go b/instrumentation/github.com/Shopify/sarama/otelsarama/version.go index 22e2e9cdca6..f1891595293 100644 --- a/instrumentation/github.com/Shopify/sarama/otelsarama/version.go +++ b/instrumentation/github.com/Shopify/sarama/otelsarama/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelsarama +package otelsarama // import "go.opentelemetry.io/contrib/instrumentation/github.com/Shopify/sarama/otelsarama" // Version is the current release version of the sarama instrumentation. func Version() string { diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/beego.go b/instrumentation/github.com/astaxie/beego/otelbeego/beego.go index 30154cb2832..e8b3e476d9b 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/beego.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/beego.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelbeego +package otelbeego // import "go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego" import ( "context" diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/common.go b/instrumentation/github.com/astaxie/beego/otelbeego/common.go index 4f06b3ef5cd..7bf0ba736e5 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/common.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/common.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelbeego +package otelbeego // import "go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego" import ( "net/http" diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/config.go b/instrumentation/github.com/astaxie/beego/otelbeego/config.go index 364526102b4..675daee434e 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/config.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelbeego +package otelbeego // import "go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego" import ( "go.opentelemetry.io/otel" diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/internal/common.go b/instrumentation/github.com/astaxie/beego/otelbeego/internal/common.go index 64a76ac2873..8b47b477db5 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/internal/common.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/internal/common.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal +package internal // import "go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego/internal" import ( "go.opentelemetry.io/otel/attribute" diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/test/doc.go b/instrumentation/github.com/astaxie/beego/otelbeego/test/doc.go index 76d6f7766db..c28f452bb6c 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/test/doc.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego/test" diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/test/version.go b/instrumentation/github.com/astaxie/beego/otelbeego/test/version.go index 23c100863c8..bcccfabdbe8 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/test/version.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego/test" // Version is the current release version of the Beego instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/astaxie/beego/otelbeego/version.go b/instrumentation/github.com/astaxie/beego/otelbeego/version.go index aaaf5891e27..01677c986ce 100644 --- a/instrumentation/github.com/astaxie/beego/otelbeego/version.go +++ b/instrumentation/github.com/astaxie/beego/otelbeego/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelbeego +package otelbeego // import "go.opentelemetry.io/contrib/instrumentation/github.com/astaxie/beego/otelbeego" // Version is the current release version of the Beego instrumentation. func Version() string { diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/config.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/config.go index fc4309379d1..58703728a4f 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/config.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otellambda +package otellambda // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" import ( "context" diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda.go index b1287bbada7..dfd213f6943 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/lambda.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otellambda +package otellambda // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" import ( "context" diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/doc.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/doc.go index 38688f5d9db..4851ccb2b88 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/doc.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/test/doc.go @@ -18,4 +18,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/test" diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go index e1fb4630033..4e48560d430 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otellambda +package otellambda // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" // Version is the current release version of the AWS Lambda instrumentation. func Version() string { diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/wrapHandler.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/wrapHandler.go index b0a26d5a8dc..be4711af8cb 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/wrapHandler.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/wrapHandler.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otellambda +package otellambda // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" import ( "context" diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/wrapLambdaHandler.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/wrapLambdaHandler.go index 54a6beb7a60..274f4760b63 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/wrapLambdaHandler.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/wrapLambdaHandler.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otellambda +package otellambda // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda" import ( "context" diff --git a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/xrayconfig.go b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/xrayconfig.go index 0ed24977b9e..31873c0c6e8 100644 --- a/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/xrayconfig.go +++ b/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig/xrayconfig.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package xrayconfig +package xrayconfig // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-lambda-go/otellambda/xrayconfig" import ( "context" diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/attributes.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/attributes.go index d0579b21a7e..a18b64e1dc2 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/attributes.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/attributes.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelaws +package otelaws // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" import ( "context" diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws.go index 19f79ebd028..c6eef18336d 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/aws.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelaws +package otelaws // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" import ( "context" diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/config.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/config.go index 4dc07f404fb..c5e8a4bc159 100755 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/config.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelaws +package otelaws // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" import ( "go.opentelemetry.io/otel/trace" diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/dynamodbattributes.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/dynamodbattributes.go index 84f0ef2a4aa..be58088e1ec 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/dynamodbattributes.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/dynamodbattributes.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelaws +package otelaws // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" import ( "context" diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/doc.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/doc.go index 302d813f537..d024b1e6e03 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/doc.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test" diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go index e3c229d4eba..afa1618e4f0 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/test" // Version is the current release version of the AWS intstrumentation test module. func Version() string { diff --git a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go index 09a8b34f4d0..134260b828e 100644 --- a/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go +++ b/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelaws +package otelaws // import "go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws" // Version is the current release version of the AWS SDKv2 instrumentation. func Version() string { diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/config.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/config.go index 633b15dca8b..d47697491c3 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/config.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmemcache +package otelmemcache // import "go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache" import ( oteltrace "go.opentelemetry.io/otel/trace" diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go index 4640b8cbe9b..20efcfd9f1b 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/gomemcache.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmemcache +package otelmemcache // import "go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache" import ( "context" diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/internal/attributes.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/internal/attributes.go index 3619c30d1da..095d751ad0b 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/internal/attributes.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/internal/attributes.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal +package internal // import "go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/internal" import ( "go.opentelemetry.io/otel/attribute" diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/doc.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/doc.go index 98321893594..8e8dac0b74b 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/doc.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test" diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/version.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/version.go index af53b051a14..3b323598f23 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/version.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/test" // Version is the current release version of the memcached instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/version.go b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/version.go index 696416fcb61..2e9d05420ef 100644 --- a/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/version.go +++ b/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmemcache +package otelmemcache // import "go.opentelemetry.io/contrib/instrumentation/github.com/bradfitz/gomemcache/memcache/otelmemcache" // Version is the current release version of the memcached instrumentation. func Version() string { diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/config.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/config.go index c93ed12dd1e..11ef952c451 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/config.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelrestful +package otelrestful // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful" import ( "go.opentelemetry.io/otel/propagation" diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go index 9e46d780959..076086e61b0 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/restful.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelrestful +package otelrestful // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful" import ( "github.com/emicklei/go-restful/v3" diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/doc.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/doc.go index 376ea336f33..00276944d35 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/doc.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/test" diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go index d90ee493851..8c4d2328e3f 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful/test" // Version is the current release version of the go-restful instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go b/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go index 522622db595..b87df2527ae 100644 --- a/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go +++ b/instrumentation/github.com/emicklei/go-restful/otelrestful/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelrestful +package otelrestful // import "go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful" // Version is the current release version of the go-restful instrumentation. func Version() string { diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go b/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go index 7aad9c5a4e1..8a9ddf3554a 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/gintrace.go @@ -14,7 +14,7 @@ // Based on https://github.com/DataDog/dd-trace-go/blob/8fb554ff7cf694267f9077ae35e27ce4689ed8b6/contrib/gin-gonic/gin/gintrace.go -package otelgin +package otelgin // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin" import ( "fmt" diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/option.go b/instrumentation/github.com/gin-gonic/gin/otelgin/option.go index 905c6745e81..2c3eb74913e 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/option.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/option.go @@ -14,7 +14,7 @@ // Based on https://github.com/DataDog/dd-trace-go/blob/8fb554ff7cf694267f9077ae35e27ce4689ed8b6/contrib/gin-gonic/gin/option.go -package otelgin +package otelgin // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin" import ( "go.opentelemetry.io/otel/propagation" diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/test/doc.go b/instrumentation/github.com/gin-gonic/gin/otelgin/test/doc.go index 348ac90032c..150d3846ff6 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/test/doc.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin/test" diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go b/instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go index 6981603ff3a..ea3206da906 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin/test" // Version is the current release version of the gin instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/gin-gonic/gin/otelgin/version.go b/instrumentation/github.com/gin-gonic/gin/otelgin/version.go index 0f74d2ac438..f6fe04cdec6 100644 --- a/instrumentation/github.com/gin-gonic/gin/otelgin/version.go +++ b/instrumentation/github.com/gin-gonic/gin/otelgin/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgin +package otelgin // import "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin" // Version is the current release version of the gin instrumentation. func Version() string { diff --git a/instrumentation/github.com/go-kit/kit/otelkit/config.go b/instrumentation/github.com/go-kit/kit/otelkit/config.go index 73a474a4c86..369735ee6e1 100644 --- a/instrumentation/github.com/go-kit/kit/otelkit/config.go +++ b/instrumentation/github.com/go-kit/kit/otelkit/config.go @@ -14,7 +14,7 @@ // Based on https://github.com/go-kit/kit/blob/3796a6b25f5c6c545454d3ed7187c4ced258083d/tracing/opencensus/endpoint_options.go -package otelkit +package otelkit // import "go.opentelemetry.io/contrib/instrumentation/github.com/go-kit/kit/otelkit" import ( "context" diff --git a/instrumentation/github.com/go-kit/kit/otelkit/endpoint.go b/instrumentation/github.com/go-kit/kit/otelkit/endpoint.go index 6601d9c2539..40b2cc0a5ca 100644 --- a/instrumentation/github.com/go-kit/kit/otelkit/endpoint.go +++ b/instrumentation/github.com/go-kit/kit/otelkit/endpoint.go @@ -14,7 +14,7 @@ // Based on https://github.com/go-kit/kit/blob/3796a6b25f5c6c545454d3ed7187c4ced258083d/tracing/opencensus/endpoint.go -package otelkit +package otelkit // import "go.opentelemetry.io/contrib/instrumentation/github.com/go-kit/kit/otelkit" import ( "context" diff --git a/instrumentation/github.com/go-kit/kit/otelkit/test/doc.go b/instrumentation/github.com/go-kit/kit/otelkit/test/doc.go index 1cbecb455de..986a4bcc73f 100644 --- a/instrumentation/github.com/go-kit/kit/otelkit/test/doc.go +++ b/instrumentation/github.com/go-kit/kit/otelkit/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/go-kit/kit/otelkit/test" diff --git a/instrumentation/github.com/go-kit/kit/otelkit/test/version.go b/instrumentation/github.com/go-kit/kit/otelkit/test/version.go index 16cc3725a7f..8fad19e7601 100644 --- a/instrumentation/github.com/go-kit/kit/otelkit/test/version.go +++ b/instrumentation/github.com/go-kit/kit/otelkit/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/go-kit/kit/otelkit/test" // Version is the current release version of the go-kit instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/go-kit/kit/otelkit/version.go b/instrumentation/github.com/go-kit/kit/otelkit/version.go index 3b7c9eec279..9ae562e53b9 100644 --- a/instrumentation/github.com/go-kit/kit/otelkit/version.go +++ b/instrumentation/github.com/go-kit/kit/otelkit/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelkit +package otelkit // import "go.opentelemetry.io/contrib/instrumentation/github.com/go-kit/kit/otelkit" // Version is the current release version of the go-kit instrumentation. func Version() string { diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/config.go b/instrumentation/github.com/gocql/gocql/otelgocql/config.go index 944edfbf7e7..4a7bea7a6e6 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/config.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgocql +package otelgocql // import "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql" import ( "github.com/gocql/gocql" diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/gocql.go b/instrumentation/github.com/gocql/gocql/otelgocql/gocql.go index 337cff805a0..9b490dd3015 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/gocql.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/gocql.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgocql +package otelgocql // import "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql" import ( "context" diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/instrument.go b/instrumentation/github.com/gocql/gocql/otelgocql/instrument.go index 5c0bd311ffe..24f41aaa986 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/instrument.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/instrument.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgocql +package otelgocql // import "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql" import ( "log" diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/internal/cass.go b/instrumentation/github.com/gocql/gocql/otelgocql/internal/cass.go index c956df09922..6baf219240e 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/internal/cass.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/internal/cass.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal +package internal // import "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql/internal" import ( "log" diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/observer.go b/instrumentation/github.com/gocql/gocql/otelgocql/observer.go index 1454f8010f1..872205c73aa 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/observer.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/observer.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgocql +package otelgocql // import "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql" import ( "context" diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/test/doc.go b/instrumentation/github.com/gocql/gocql/otelgocql/test/doc.go index e9b1073298c..c82616f1719 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/test/doc.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql/test" diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/test/version.go b/instrumentation/github.com/gocql/gocql/otelgocql/test/version.go index dee3b9e24ae..31e7cf80ade 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/test/version.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql/test" // Version is the current release version of the gocql instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/gocql/gocql/otelgocql/version.go b/instrumentation/github.com/gocql/gocql/otelgocql/version.go index 7c1fb67d4eb..49dac43a771 100644 --- a/instrumentation/github.com/gocql/gocql/otelgocql/version.go +++ b/instrumentation/github.com/gocql/gocql/otelgocql/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgocql +package otelgocql // import "go.opentelemetry.io/contrib/instrumentation/github.com/gocql/gocql/otelgocql" // Version is the current release version of the gocql instrumentation. func Version() string { diff --git a/instrumentation/github.com/gorilla/mux/otelmux/config.go b/instrumentation/github.com/gorilla/mux/otelmux/config.go index 97996b5d596..2e4d60b6778 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/config.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmux +package otelmux // import "go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux" import ( "go.opentelemetry.io/otel/propagation" diff --git a/instrumentation/github.com/gorilla/mux/otelmux/mux.go b/instrumentation/github.com/gorilla/mux/otelmux/mux.go index 7df7b0cf73f..a3146b64219 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/mux.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/mux.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmux +package otelmux // import "go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux" import ( "fmt" diff --git a/instrumentation/github.com/gorilla/mux/otelmux/test/doc.go b/instrumentation/github.com/gorilla/mux/otelmux/test/doc.go index a83a64edc09..39a8250b01b 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/test/doc.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/test" diff --git a/instrumentation/github.com/gorilla/mux/otelmux/test/version.go b/instrumentation/github.com/gorilla/mux/otelmux/test/version.go index 30be37c837a..1894d1d2894 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/test/version.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux/test" // Version is the current release version of the gorilla/mux instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/gorilla/mux/otelmux/version.go b/instrumentation/github.com/gorilla/mux/otelmux/version.go index 17af5cb74b1..4a25a7195d0 100644 --- a/instrumentation/github.com/gorilla/mux/otelmux/version.go +++ b/instrumentation/github.com/gorilla/mux/otelmux/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmux +package otelmux // import "go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux" // Version is the current release version of the gorilla/mux instrumentation. func Version() string { diff --git a/instrumentation/github.com/labstack/echo/otelecho/config.go b/instrumentation/github.com/labstack/echo/otelecho/config.go index cf2d6bdd057..9ff40030926 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/config.go +++ b/instrumentation/github.com/labstack/echo/otelecho/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelecho +package otelecho // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho" import ( "github.com/labstack/echo/v4/middleware" diff --git a/instrumentation/github.com/labstack/echo/otelecho/echo.go b/instrumentation/github.com/labstack/echo/otelecho/echo.go index ce337898864..40fa27caee0 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/echo.go +++ b/instrumentation/github.com/labstack/echo/otelecho/echo.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelecho +package otelecho // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho" import ( "fmt" diff --git a/instrumentation/github.com/labstack/echo/otelecho/test/doc.go b/instrumentation/github.com/labstack/echo/otelecho/test/doc.go index 6799fac12c2..70ba2b5eec1 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/test/doc.go +++ b/instrumentation/github.com/labstack/echo/otelecho/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/test" diff --git a/instrumentation/github.com/labstack/echo/otelecho/test/version.go b/instrumentation/github.com/labstack/echo/otelecho/test/version.go index b75162ea1bf..f3c8dd71361 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/test/version.go +++ b/instrumentation/github.com/labstack/echo/otelecho/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho/test" // Version is the current release version of the echo instrumentation test module. func Version() string { diff --git a/instrumentation/github.com/labstack/echo/otelecho/version.go b/instrumentation/github.com/labstack/echo/otelecho/version.go index 9a69d8ce118..88e22a8de15 100644 --- a/instrumentation/github.com/labstack/echo/otelecho/version.go +++ b/instrumentation/github.com/labstack/echo/otelecho/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelecho +package otelecho // import "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho" // Version is the current release version of the echo instrumentation. func Version() string { diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/config.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/config.go index ce5625c4c3b..b9acefa11fe 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/config.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmongo +package otelmongo // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo" import ( "go.opentelemetry.io/otel" diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go index a8a8f76c42e..33accfbd0d2 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/mongo.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmongo +package otelmongo // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo" import ( "context" diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/doc.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/doc.go index b18aa33bf04..909b0a331d3 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/doc.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test" diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/version.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/version.go index 0dbc2223839..d15a775c11c 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/version.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/test" // Version is the current release version of the mongo-driver instrumentation test module. func Version() string { diff --git a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/version.go b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/version.go index 8ffefb9aadc..f6be5c5505f 100644 --- a/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/version.go +++ b/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmongo +package otelmongo // import "go.opentelemetry.io/contrib/instrumentation/go.mongodb.org/mongo-driver/mongo/otelmongo" // Version is the current release version of the mongo-driver instrumentation. func Version() string { diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/example/config/config.go b/instrumentation/google.golang.org/grpc/otelgrpc/example/config/config.go index 45978631dfb..a003e27e223 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/example/config/config.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/example/config/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package config +package config // import "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/example/config" import ( "log" diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/grpctrace.go b/instrumentation/google.golang.org/grpc/otelgrpc/grpctrace.go index aaeb19e30d0..b9b85972725 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/grpctrace.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/grpctrace.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgrpc +package otelgrpc // import "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" import ( "context" diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go b/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go index b1d9f643d84..40adf723531 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/interceptor.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgrpc +package otelgrpc // import "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" // gRPC tracing middleware // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/rpc.md diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go b/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go index 56a682102bb..e72986b7898 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/internal/parse.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal +package internal // import "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/internal" import ( "strings" diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/semconv.go b/instrumentation/google.golang.org/grpc/otelgrpc/semconv.go index 73f14a458e1..b0d5c41dea6 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/semconv.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/semconv.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgrpc +package otelgrpc // import "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" import ( "go.opentelemetry.io/otel/attribute" diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/doc.go b/instrumentation/google.golang.org/grpc/otelgrpc/test/doc.go index 84747f09dea..03f2cf8ee44 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/doc.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/test" diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/test/version.go b/instrumentation/google.golang.org/grpc/otelgrpc/test/version.go index 4c41a584686..313d275bd84 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/test/version.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/test" // Version is the current release version of the gRPC instrumentation test module. func Version() string { diff --git a/instrumentation/google.golang.org/grpc/otelgrpc/version.go b/instrumentation/google.golang.org/grpc/otelgrpc/version.go index c312b9c94b3..bc28ba29371 100644 --- a/instrumentation/google.golang.org/grpc/otelgrpc/version.go +++ b/instrumentation/google.golang.org/grpc/otelgrpc/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelgrpc +package otelgrpc // import "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" // Version is the current release version of the gRPC instrumentation. func Version() string { diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/config.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/config.go index 6193a8384e7..f65a9c7a9ab 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/config.go +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmacaron +package otelmacaron // import "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron" import ( "go.opentelemetry.io/otel" diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron.go index bb7ad993cef..0ff4c194a3c 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron.go +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/macaron.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmacaron +package otelmacaron // import "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron" import ( "fmt" diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/doc.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/doc.go index 02d9cb99a18..e0a43d9b626 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/doc.go +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron/test" diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/version.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/version.go index c7516569d3e..c4b94edaa98 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/version.go +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron/test" // Version is the current release version of the macron instrumentation test module. func Version() string { diff --git a/instrumentation/gopkg.in/macaron.v1/otelmacaron/version.go b/instrumentation/gopkg.in/macaron.v1/otelmacaron/version.go index 1513b2a3713..79bf3af5d4f 100644 --- a/instrumentation/gopkg.in/macaron.v1/otelmacaron/version.go +++ b/instrumentation/gopkg.in/macaron.v1/otelmacaron/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelmacaron +package otelmacaron // import "go.opentelemetry.io/contrib/instrumentation/gopkg.in/macaron.v1/otelmacaron" // Version is the current release version of the macron instrumentation. func Version() string { diff --git a/instrumentation/host/version.go b/instrumentation/host/version.go index bf8c4eb1182..1ea48b7f04e 100644 --- a/instrumentation/host/version.go +++ b/instrumentation/host/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package host +package host // import "go.opentelemetry.io/contrib/instrumentation/host" // Version is the current release version of the host instrumentation. func Version() string { diff --git a/instrumentation/net/http/httptrace/otelhttptrace/api.go b/instrumentation/net/http/httptrace/otelhttptrace/api.go index 491061583ee..dc29163dd6c 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/api.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/api.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttptrace +package otelhttptrace // import "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace" import ( "context" diff --git a/instrumentation/net/http/httptrace/otelhttptrace/clienttrace.go b/instrumentation/net/http/httptrace/otelhttptrace/clienttrace.go index a9c20429e0d..795b51e7f8a 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/clienttrace.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/clienttrace.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttptrace +package otelhttptrace // import "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace" import ( "context" diff --git a/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go b/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go index 6fca43a3ba8..c467154a52e 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/httptrace.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttptrace +package otelhttptrace // import "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace" import ( "context" diff --git a/instrumentation/net/http/httptrace/otelhttptrace/test/doc.go b/instrumentation/net/http/httptrace/otelhttptrace/test/doc.go index 8aa02ef2f9f..39fcd0f8285 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/test/doc.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/test" diff --git a/instrumentation/net/http/httptrace/otelhttptrace/test/version.go b/instrumentation/net/http/httptrace/otelhttptrace/test/version.go index 486b7155910..3728213eff9 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/test/version.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace/test" // Version is the current release version of the httptrace instrumentation test module. func Version() string { diff --git a/instrumentation/net/http/httptrace/otelhttptrace/version.go b/instrumentation/net/http/httptrace/otelhttptrace/version.go index c75c1b3048c..1ad025f554a 100644 --- a/instrumentation/net/http/httptrace/otelhttptrace/version.go +++ b/instrumentation/net/http/httptrace/otelhttptrace/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttptrace +package otelhttptrace // import "go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace" // Version is the current release version of the httptrace instrumentation. func Version() string { diff --git a/instrumentation/net/http/otelhttp/client.go b/instrumentation/net/http/otelhttp/client.go index 0816b9f5daa..c5c1f51fc78 100644 --- a/instrumentation/net/http/otelhttp/client.go +++ b/instrumentation/net/http/otelhttp/client.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttp +package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" import ( "context" diff --git a/instrumentation/net/http/otelhttp/common.go b/instrumentation/net/http/otelhttp/common.go index dcc59449e43..87cec5acadb 100644 --- a/instrumentation/net/http/otelhttp/common.go +++ b/instrumentation/net/http/otelhttp/common.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttp +package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" import ( "net/http" diff --git a/instrumentation/net/http/otelhttp/config.go b/instrumentation/net/http/otelhttp/config.go index 46d5c1b6379..a76cec35716 100644 --- a/instrumentation/net/http/otelhttp/config.go +++ b/instrumentation/net/http/otelhttp/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttp +package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" import ( "context" diff --git a/instrumentation/net/http/otelhttp/filters/filters.go b/instrumentation/net/http/otelhttp/filters/filters.go index 20a12990593..7993871efb2 100644 --- a/instrumentation/net/http/otelhttp/filters/filters.go +++ b/instrumentation/net/http/otelhttp/filters/filters.go @@ -14,7 +14,7 @@ // Package filters provides a set of filters useful with the // otelhttp.WithFilter() option to control which inbound requests are traced. -package filters +package filters // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/filters" import ( "net/http" diff --git a/instrumentation/net/http/otelhttp/filters/header.go b/instrumentation/net/http/otelhttp/filters/header.go index 5df0c003b0b..6bc68775534 100644 --- a/instrumentation/net/http/otelhttp/filters/header.go +++ b/instrumentation/net/http/otelhttp/filters/header.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package filters +package filters // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/filters" import ( "net/http" diff --git a/instrumentation/net/http/otelhttp/handler.go b/instrumentation/net/http/otelhttp/handler.go index 2f26ae8597c..e3bc701a2a7 100644 --- a/instrumentation/net/http/otelhttp/handler.go +++ b/instrumentation/net/http/otelhttp/handler.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttp +package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" import ( "io" diff --git a/instrumentation/net/http/otelhttp/labeler.go b/instrumentation/net/http/otelhttp/labeler.go index 7b7d1c0aced..26a51a18050 100644 --- a/instrumentation/net/http/otelhttp/labeler.go +++ b/instrumentation/net/http/otelhttp/labeler.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttp +package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" import ( "context" diff --git a/instrumentation/net/http/otelhttp/test/doc.go b/instrumentation/net/http/otelhttp/test/doc.go index 0d190a314c9..38a09e417c4 100644 --- a/instrumentation/net/http/otelhttp/test/doc.go +++ b/instrumentation/net/http/otelhttp/test/doc.go @@ -19,4 +19,4 @@ This package is in a separate module from the instrumentation it tests to isolate the dependency of the default SDK and not impose this as a transitive dependency for users. */ -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/test" diff --git a/instrumentation/net/http/otelhttp/test/version.go b/instrumentation/net/http/otelhttp/test/version.go index 00121fdd42b..d7170cd2abf 100644 --- a/instrumentation/net/http/otelhttp/test/version.go +++ b/instrumentation/net/http/otelhttp/test/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package test +package test // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/test" // Version is the current release version of the otelhttp instrumentation test module. func Version() string { diff --git a/instrumentation/net/http/otelhttp/transport.go b/instrumentation/net/http/otelhttp/transport.go index 121ad99b0a6..b436f6a2a9e 100644 --- a/instrumentation/net/http/otelhttp/transport.go +++ b/instrumentation/net/http/otelhttp/transport.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttp +package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" import ( "context" diff --git a/instrumentation/net/http/otelhttp/version.go b/instrumentation/net/http/otelhttp/version.go index c882ca4388f..1939d923327 100644 --- a/instrumentation/net/http/otelhttp/version.go +++ b/instrumentation/net/http/otelhttp/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttp +package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" // Version is the current release version of the otelhttp instrumentation. func Version() string { diff --git a/instrumentation/net/http/otelhttp/wrap.go b/instrumentation/net/http/otelhttp/wrap.go index ec787c820a0..b453b92e4cc 100644 --- a/instrumentation/net/http/otelhttp/wrap.go +++ b/instrumentation/net/http/otelhttp/wrap.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package otelhttp +package otelhttp // import "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" import ( "context" diff --git a/instrumentation/runtime/version.go b/instrumentation/runtime/version.go index cae089e1f52..fb073ebbb9b 100644 --- a/instrumentation/runtime/version.go +++ b/instrumentation/runtime/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package runtime +package runtime // import "go.opentelemetry.io/contrib/instrumentation/runtime" // Version is the current release version of the runtime instrumentation. func Version() string { diff --git a/internal/util/testutil.go b/internal/util/testutil.go index 2754f5cb9a1..3c945e6f10d 100644 --- a/internal/util/testutil.go +++ b/internal/util/testutil.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package util +package util // import "go.opentelemetry.io/contrib/internal/util" import ( "fmt" diff --git a/propagators/aws/version.go b/propagators/aws/version.go index a7e797289e6..4aa076133e1 100644 --- a/propagators/aws/version.go +++ b/propagators/aws/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package aws +package aws // import "go.opentelemetry.io/contrib/propagators/aws" // Version is the current release version of the AWS XRay propagator. func Version() string { diff --git a/propagators/aws/xray/idgenerator.go b/propagators/aws/xray/idgenerator.go index 1cc039312f5..52dc203cae8 100644 --- a/propagators/aws/xray/idgenerator.go +++ b/propagators/aws/xray/idgenerator.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package xray +package xray // import "go.opentelemetry.io/contrib/propagators/aws/xray" import ( "context" diff --git a/propagators/aws/xray/propagator.go b/propagators/aws/xray/propagator.go index f21e80c7282..14481926ebc 100644 --- a/propagators/aws/xray/propagator.go +++ b/propagators/aws/xray/propagator.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package xray +package xray // import "go.opentelemetry.io/contrib/propagators/aws/xray" import ( "context" diff --git a/propagators/b3/b3_config.go b/propagators/b3/b3_config.go index c616f2cb921..b09dbd3fb30 100644 --- a/propagators/b3/b3_config.go +++ b/propagators/b3/b3_config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package b3 +package b3 // import "go.opentelemetry.io/contrib/propagators/b3" type config struct { // InjectEncoding are the B3 encodings used when injecting trace diff --git a/propagators/b3/b3_propagator.go b/propagators/b3/b3_propagator.go index 65800972814..f63b8e332a8 100644 --- a/propagators/b3/b3_propagator.go +++ b/propagators/b3/b3_propagator.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package b3 +package b3 // import "go.opentelemetry.io/contrib/propagators/b3" import ( "context" diff --git a/propagators/b3/context.go b/propagators/b3/context.go index 54aa6260aa9..988cd2ca821 100644 --- a/propagators/b3/context.go +++ b/propagators/b3/context.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package b3 +package b3 // import "go.opentelemetry.io/contrib/propagators/b3" import "context" diff --git a/propagators/b3/version.go b/propagators/b3/version.go index b1095b585c9..56de7e6ce95 100644 --- a/propagators/b3/version.go +++ b/propagators/b3/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package b3 +package b3 // import "go.opentelemetry.io/contrib/propagators/b3" // Version is the current release version of the B3 propagator. func Version() string { diff --git a/propagators/jaeger/context.go b/propagators/jaeger/context.go index a11fa8c87e7..8a62451f746 100644 --- a/propagators/jaeger/context.go +++ b/propagators/jaeger/context.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaeger +package jaeger // import "go.opentelemetry.io/contrib/propagators/jaeger" import "context" diff --git a/propagators/jaeger/jaeger_propagator.go b/propagators/jaeger/jaeger_propagator.go index ab2305362b7..db3384e0129 100644 --- a/propagators/jaeger/jaeger_propagator.go +++ b/propagators/jaeger/jaeger_propagator.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaeger +package jaeger // import "go.opentelemetry.io/contrib/propagators/jaeger" import ( "context" diff --git a/propagators/jaeger/version.go b/propagators/jaeger/version.go index bed91f31929..c8a6a0b4662 100644 --- a/propagators/jaeger/version.go +++ b/propagators/jaeger/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaeger +package jaeger // import "go.opentelemetry.io/contrib/propagators/jaeger" // Version is the current release version of the Jaeger propagator. func Version() string { diff --git a/propagators/opencensus/version.go b/propagators/opencensus/version.go index 458f6486edd..df87fe7727a 100644 --- a/propagators/opencensus/version.go +++ b/propagators/opencensus/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensus +package opencensus // import "go.opentelemetry.io/contrib/propagators/opencensus" // Version is the current release version of the OpenCensus propagator. func Version() string { diff --git a/propagators/ot/ot_propagator.go b/propagators/ot/ot_propagator.go index 9d340790138..fa414570bd9 100644 --- a/propagators/ot/ot_propagator.go +++ b/propagators/ot/ot_propagator.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ot +package ot // import "go.opentelemetry.io/contrib/propagators/ot" import ( "context" diff --git a/propagators/ot/version.go b/propagators/ot/version.go index 964160d442f..31038a56582 100644 --- a/propagators/ot/version.go +++ b/propagators/ot/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ot +package ot // import "go.opentelemetry.io/contrib/propagators/ot" // Version is the current release version of the ot propagator. func Version() string { diff --git a/samplers/jaegerremote/constants.go b/samplers/jaegerremote/constants.go index 9b1bb9ea315..329b7ea4b69 100644 --- a/samplers/jaegerremote/constants.go +++ b/samplers/jaegerremote/constants.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaegerremote +package jaegerremote // import "go.opentelemetry.io/contrib/samplers/jaegerremote" import ( "fmt" diff --git a/samplers/jaegerremote/internal/testutils/mock_agent.go b/samplers/jaegerremote/internal/testutils/mock_agent.go index 0e5c6690821..b1fa87e9314 100644 --- a/samplers/jaegerremote/internal/testutils/mock_agent.go +++ b/samplers/jaegerremote/internal/testutils/mock_agent.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package testutils +package testutils // import "go.opentelemetry.io/contrib/samplers/jaegerremote/internal/testutils" import ( "encoding/json" diff --git a/samplers/jaegerremote/internal/testutils/sampling_manager.go b/samplers/jaegerremote/internal/testutils/sampling_manager.go index adcfea1fff6..4fd17fae278 100644 --- a/samplers/jaegerremote/internal/testutils/sampling_manager.go +++ b/samplers/jaegerremote/internal/testutils/sampling_manager.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package testutils +package testutils // import "go.opentelemetry.io/contrib/samplers/jaegerremote/internal/testutils" import ( "sync" diff --git a/samplers/jaegerremote/internal/utils/http_json.go b/samplers/jaegerremote/internal/utils/http_json.go index fe5f7d76dc0..81544c46cd1 100644 --- a/samplers/jaegerremote/internal/utils/http_json.go +++ b/samplers/jaegerremote/internal/utils/http_json.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package utils +package utils // import "go.opentelemetry.io/contrib/samplers/jaegerremote/internal/utils" import ( "encoding/json" diff --git a/samplers/jaegerremote/internal/utils/rate_limiter.go b/samplers/jaegerremote/internal/utils/rate_limiter.go index 56bd5e6f8b6..b179b8d133d 100644 --- a/samplers/jaegerremote/internal/utils/rate_limiter.go +++ b/samplers/jaegerremote/internal/utils/rate_limiter.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package utils +package utils // import "go.opentelemetry.io/contrib/samplers/jaegerremote/internal/utils" import ( "sync" diff --git a/samplers/jaegerremote/sampler.go b/samplers/jaegerremote/sampler.go index 1decbb6e41d..70a2a389bb2 100644 --- a/samplers/jaegerremote/sampler.go +++ b/samplers/jaegerremote/sampler.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaegerremote +package jaegerremote // import "go.opentelemetry.io/contrib/samplers/jaegerremote" import ( "encoding/binary" diff --git a/samplers/jaegerremote/sampler_remote.go b/samplers/jaegerremote/sampler_remote.go index 5261127ffa3..c4cc9c070f9 100644 --- a/samplers/jaegerremote/sampler_remote.go +++ b/samplers/jaegerremote/sampler_remote.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaegerremote +package jaegerremote // import "go.opentelemetry.io/contrib/samplers/jaegerremote" import ( "encoding/json" diff --git a/samplers/jaegerremote/sampler_remote_options.go b/samplers/jaegerremote/sampler_remote_options.go index 3e0394a423f..354a258a58c 100644 --- a/samplers/jaegerremote/sampler_remote_options.go +++ b/samplers/jaegerremote/sampler_remote_options.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaegerremote +package jaegerremote // import "go.opentelemetry.io/contrib/samplers/jaegerremote" import ( "time" diff --git a/samplers/jaegerremote/version.go b/samplers/jaegerremote/version.go index 9477b870433..a3259856b8a 100644 --- a/samplers/jaegerremote/version.go +++ b/samplers/jaegerremote/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package jaegerremote +package jaegerremote // import "go.opentelemetry.io/contrib/samplers/jaegerremote" // Version is the current release version of the Jaeger remote sampler. func Version() string { diff --git a/tools/go.mod b/tools/go.mod index 2c3695823f3..254463ca1fb 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -5,7 +5,10 @@ go 1.13 require ( github.com/client9/misspell v0.3.4 github.com/golangci/golangci-lint v1.45.0 + github.com/jcchavezs/porto v0.4.0 + github.com/mjibson/esc v0.2.0 github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad + go.opentelemetry.io/build-tools/dbotconf v0.0.0-20220321183619-864aabdd471d go.opentelemetry.io/build-tools/multimod v0.0.0-20210920164323-2ceabab23375 golang.org/x/tools v0.1.10 ) diff --git a/tools/go.sum b/tools/go.sum index 1a030b9cff4..adf7f69703f 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -474,6 +474,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jcchavezs/porto v0.4.0 h1:Zj7RligrxmDdKGo6fBO2xYAHxEgrVBfs1YAja20WbV4= +github.com/jcchavezs/porto v0.4.0/go.mod h1:fESH0gzDHiutHRdX2hv27ojnOVFco37hg1W6E9EZF4A= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+WcM= github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= @@ -611,6 +613,8 @@ github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGg github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mjibson/esc v0.2.0 h1:k96hdaR9Z+nMcnDwNrOvhdBqtjyMrbVyxLpsRCdP2mA= +github.com/mjibson/esc v0.2.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1OPs= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= @@ -809,8 +813,9 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/sylvia7788/contextcheck v1.0.4 h1:MsiVqROAdr0efZc/fOCt0c235qm9XJqHtWwM+2h2B04= @@ -891,8 +896,11 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/build-tools v0.0.0-20210719163622-92017e64f35b h1:tFMjUqEDGM2F82663yYidqTluwEJmmihk/AXr19J7rI= go.opentelemetry.io/build-tools v0.0.0-20210719163622-92017e64f35b/go.mod h1:zZRrJN8qdwDdPNkCEyww4SW54mM1Da0v9H3TyQet9T4= +go.opentelemetry.io/build-tools v0.0.0-20220321164008-b8e03aff061a h1:yLxbGYl9MXOqD0o3unX/nJn+y+1loFNWZJWkfeguYV8= +go.opentelemetry.io/build-tools v0.0.0-20220321164008-b8e03aff061a/go.mod h1:gkLviEngQuoeD670EP1KA/Oj4i5oNAzb+pjkk+4ecaQ= +go.opentelemetry.io/build-tools/dbotconf v0.0.0-20220321183619-864aabdd471d h1:qKg9rq2ev4alNDxtXPF0AHo4pVGjY3Fo49VbND7217A= +go.opentelemetry.io/build-tools/dbotconf v0.0.0-20220321183619-864aabdd471d/go.mod h1:m66/mN6fLhxyQkadUFpjV0RqhhyJR24w8z8aAnGZ+JI= go.opentelemetry.io/build-tools/multimod v0.0.0-20210920164323-2ceabab23375 h1:5zVDNFcOwiMee9Qm8sH08iw+9cJZk+l/Y3mVa2D/zmM= go.opentelemetry.io/build-tools/multimod v0.0.0-20210920164323-2ceabab23375/go.mod h1:mPh1L/tfTGyVNnSQOTlTSi2CBpci13Ft8jE4Glik2es= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= diff --git a/tools/tools.go b/tools/tools.go index c717c651dc1..419051e9202 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -15,12 +15,15 @@ //go:build tools // +build tools -package tools +package tools // import "go.opentelemetry.io/contrib/tools" import ( _ "github.com/client9/misspell/cmd/misspell" _ "github.com/golangci/golangci-lint/cmd/golangci-lint" + _ "github.com/jcchavezs/porto/cmd/porto" + _ "github.com/mjibson/esc" _ "github.com/wadey/gocovmerge" + _ "go.opentelemetry.io/build-tools/dbotconf" _ "go.opentelemetry.io/build-tools/multimod" _ "golang.org/x/tools/cmd/stringer" ) diff --git a/tools/version.go b/tools/version.go index fb7fc9a19e4..3d219c5893f 100644 --- a/tools/version.go +++ b/tools/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package tools +package tools // import "go.opentelemetry.io/contrib/tools" // Version is the current release version of the OpenTelemetry Contrib tools. func Version() string { diff --git a/zpages/boundaries.go b/zpages/boundaries.go index 71035064772..3d437170a90 100644 --- a/zpages/boundaries.go +++ b/zpages/boundaries.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package zpages +package zpages // import "go.opentelemetry.io/contrib/zpages" import ( "sort" diff --git a/zpages/bucket.go b/zpages/bucket.go index 26d8b2f6174..f88c73a3410 100644 --- a/zpages/bucket.go +++ b/zpages/bucket.go @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package zpages +package zpages // import "go.opentelemetry.io/contrib/zpages" import ( "time" diff --git a/zpages/internal/gen.go b/zpages/internal/gen.go index 677c701c6de..415494061a6 100644 --- a/zpages/internal/gen.go +++ b/zpages/internal/gen.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package internal +package internal // import "go.opentelemetry.io/contrib/zpages/internal" // go get https://github.com/mjibson/esc.git -//go:generate esc -pkg internal -o resources.go templates/ +//go:generate esc -pkg internal -modtime=1647459395 -o resources.go templates/ diff --git a/zpages/internal/resources.go b/zpages/internal/resources.go index a94f7882d04..aa850454832 100644 --- a/zpages/internal/resources.go +++ b/zpages/internal/resources.go @@ -1,4 +1,4 @@ -// Code generated by "esc -pkg internal -o resources.go templates/"; DO NOT EDIT. +// Code generated by "esc -pkg internal -modtime=1647459395 -o resources.go templates/"; DO NOT EDIT. package internal @@ -213,7 +213,7 @@ var _escData = map[string]*_escFile{ name: "footer.html", local: "templates/footer.html", size: 16, - modtime: 1626459744, + modtime: 1647459395, compressed: ` H4sIAAAAAAAC/7LRT8pPqbTjstHPKMnNseMCBAAA//8ATCBFEAAAAA== `, @@ -222,14 +222,14 @@ H4sIAAAAAAAC/7LRT8pPqbTjstHPKMnNseMCBAAA//8ATCBFEAAAAA== "/templates/header.html": { name: "header.html", local: "templates/header.html", - size: 529, - modtime: 1626483715, + size: 479, + modtime: 1647459395, compressed: ` -H4sIAAAAAAAC/5TRv08DIRQH8P3+CmQ1BRsXYzgc1MHB6NDFkXLvjmf5cYFXm0vT/93gnUPjUicIDz75 -kq+6enp73Hy8PzNHwetG1YV5E4eWQ+RaOTCdbhhjTAUgw6wzuQC1fE/96o4vI0LyoI9Hsamb00nJ+WSe -eow7lsG3vLiUye6JoU2RM5ehb7mUh8NBpBEigYcAlCeBSfbmq94SaBOXfyWaPBQHQL/MuN96tPLcsaVc -9NgRjeVeyj5FKmJIafBgRizCpiBrjIfeBPRT+2oIMhp//WJTLPwftE0diAEodL5+by1uxY0MCycwdjik -1YhxJwLGn+ALXmzGkVgHPWRWsr2UrMxn4VrJWdCNknOdapu6qZa9PuvMrXXzHQAA//+9KC/wEQIAAA== +H4sIAAAAAAAC/5TRv04EIRAG8H6fAmnNgRsbY1gs1MLCaHGNJbLDMh5/NjBnsrncuxuyp4naaMWEj/yY +5FNnd0+325fne+YpBt2pdrBg0jRwSFwrD2bUHWOMqQhkmPWmVKCB78ltrvgpIqQA+nAQ2zYcj0quN2sa +MO1YgTDw6nMhuyeGNifOfAE3cE8012sp8wyJIEAEKovALJ15b+/q5yDQZi5/o7QEqB6AfoouJ6piynkK +YGaswuYom3TjTMSwDI+GoKAJ5w/tH/4P2uYRxAQUx9BW7cWluJDxxAlMI055M2PaiYhJ2PqFV1twJjaC +g8JqsX8lG/NWuVZyFXSn5FqOes3j0qrrvzXge919BAAA//9o89W63wEAAA== `, }, @@ -237,7 +237,7 @@ eow7lsG3vLiUye6JoU2RM5ehb7mUh8NBpBEigYcAlCeBSfbmq94SaBOXfyWaPBQHQL/MuN96tPLcsaVc name: "summary.html", local: "templates/summary.html", size: 1631, - modtime: 1626474833, + modtime: 1647459395, compressed: ` H4sIAAAAAAAC/6yVTY/aMBCG7/srRiniVGC3t9LEVSvtbdXDbm9VD04yhAgziWzDFlz/98of4SObttqF C3Kc8cw87+shqea5QFB6JzBL8kaWKCeq5UVN1RxuE3YDAJBqGRbhoYSiEarllN0BF3VFmcCFZmnOnlpO @@ -255,7 +255,7 @@ AA== name: "traces.html", local: "templates/traces.html", size: 420, - modtime: 1626713187, + modtime: 1647459395, compressed: ` H4sIAAAAAAAC/4yQsU7EMBBEe3/FKhLSXUHCpaA4jDuQaCgCErUdLxDh2Mab6EBm/x05RwHKFWxljWdG miejkkY9RO3hXo+4h5zr8mAG2Rglm6iEjKqo88gMHb7PSBP9fCRU4ukVPZy+G6cjoYUNYb8V5/88kXPS diff --git a/zpages/spanprocessor.go b/zpages/spanprocessor.go index 327fdf69a73..424b6c0e100 100644 --- a/zpages/spanprocessor.go +++ b/zpages/spanprocessor.go @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package zpages +package zpages // import "go.opentelemetry.io/contrib/zpages" import ( "context" diff --git a/zpages/templates.go b/zpages/templates.go index a9364015a94..5fe8aa74867 100644 --- a/zpages/templates.go +++ b/zpages/templates.go @@ -14,7 +14,7 @@ // limitations under the License. // -package zpages +package zpages // import "go.opentelemetry.io/contrib/zpages" import ( "fmt" diff --git a/zpages/tracez.go b/zpages/tracez.go index 7bcde1907eb..cb3325a039d 100644 --- a/zpages/tracez.go +++ b/zpages/tracez.go @@ -13,7 +13,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package zpages +package zpages // import "go.opentelemetry.io/contrib/zpages" import ( "fmt" diff --git a/zpages/version.go b/zpages/version.go index e6f2814b012..482b3a993c1 100644 --- a/zpages/version.go +++ b/zpages/version.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package zpages +package zpages // import "go.opentelemetry.io/contrib/zpages" // Version is the current release version of the zpages span processor. func Version() string {