Merge pull request elastic#3739 from JonasKunz/reset_major_branch

Reset major branch to main

.buildkite/hooks/prepare-common.sh

@@ -35,6 +35,7 @@ fi
 
 # Validate java is available in the runner.
 java -version
+
 echo "--- Prepare github secrets :vault:"
 VAULT_SECRET_PATH=kv/ci-shared/observability-ci/github-bot-user
 GITHUB_SECRET=$(vault kv get -field token "${VAULT_SECRET_PATH}")

.github/workflows/README.md

@@ -35,6 +35,7 @@ Every time there is a merge to main or any branches the whole workflow will comp
 ### Release process
 
 To release a new version of apm-agent-java, you must use the two GitHub Workflows.
+
 - Trigger the `release-step-1` GH workflow
   - parameters: version to release
   - will open `release-step-2` PR

.github/workflows/pre-post-release.yml

@@ -64,6 +64,7 @@ jobs:
           token: ${{ env.GITHUB_TOKEN }}
 
       - uses: elastic/oblt-actions/git/setup@v1
+
       - name: Create the release tag (post phase)
         if: inputs.phase == 'post'
         run: |
@@ -90,6 +91,7 @@ jobs:
           git add --all
           git commit -m "${{ inputs.phase }} release: elastic-apm-agent ${{ env.RELEASE_VERSION_TAG }}"
           git push origin ${{ env.BRANCH_NAME }}
+
       - name: Create the ${{ inputs.phase }} release PR
         run: gh pr create --title="${{ inputs.pr_title }}" --base main --head ${{ env.BRANCH_NAME }} -b "${{ inputs.pr_body }}"
         env:

CHANGELOG.asciidoc

@@ -49,6 +49,7 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 ===== Features
 * Added option to make routing-key part of RabbitMQ transaction/span names - {pull}3636[#3636]
 * Added internal option for capturing request bodies for apache httpclient v4 - {pull}3692[#3692]
+
 [[release-notes-1.50.0]]
 ==== 1.50.0 - 2024/05/28
 

apm-agent-core/src/main/java/co/elastic/apm/agent/impl/context/BodyCaptureImpl.java

@@ -1,21 +1,3 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you 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.
- */
 package co.elastic.apm.agent.impl.context;
 
 import co.elastic.apm.agent.objectpool.Resetter;

apm-agent-core/src/main/java/co/elastic/apm/agent/report/serialize/DslJsonSerializer.java

@@ -68,7 +68,6 @@
 import co.elastic.apm.agent.tracer.metrics.DslJsonUtil;
 import co.elastic.apm.agent.tracer.metrics.Labels;
 import co.elastic.apm.agent.tracer.pooling.Recyclable;
-import co.elastic.apm.agent.tracer.metrics.DslJsonUtil;
 import com.dslplatform.json.BoolConverter;
 import com.dslplatform.json.DslJson;
 import com.dslplatform.json.JsonWriter;

apm-agent-core/src/test/java/co/elastic/apm/agent/impl/context/BodyCaptureTest.java

@@ -1,21 +1,3 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you 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.
- */
 package co.elastic.apm.agent.impl.context;
 
 import org.junit.jupiter.api.Test;

apm-agent-plugins/apm-awslambda-plugin/src/test/java/co/elastic/apm/agent/awslambda/ApiGatewayV2LambdaTest.java

@@ -30,7 +30,6 @@
 import co.elastic.apm.agent.tracer.configuration.WebConfiguration;
 import co.elastic.apm.agent.impl.transaction.FaasImpl;
 import co.elastic.apm.agent.tracer.metadata.PotentiallyMultiValuedMap;
-import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPEvent;
 import com.amazonaws.services.lambda.runtime.events.APIGatewayV2HTTPResponse;
 import org.junit.BeforeClass;

apm-agent-tracer/src/main/java/co/elastic/apm/agent/tracer/NoopTracer.java

@@ -168,6 +168,7 @@ public void addShutdownHook(AutoCloseable hook) {
     @Override
     public void reportMetric(JsonWriter metrics) {
     }
+
     @Nullable
     @Override
     public ServiceInfo getServiceInfoForClassLoader(@Nullable ClassLoader initiatingClassLoader) {

apm-agent-tracer/src/main/java/co/elastic/apm/agent/tracer/Tracer.java

@@ -112,6 +112,7 @@ public interface Tracer {
     void flush();
 
     void completeMetaData(String name, String version, String id, String region);
+
     @Nullable
     ServiceInfo getServiceInfoForClassLoader(@Nullable ClassLoader initiatingClassLoader);
 

apm-agent-tracer/src/main/java/co/elastic/apm/agent/tracer/metadata/BodyCapture.java

@@ -1,21 +1,3 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you 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.
- */
 package co.elastic.apm.agent.tracer.metadata;
 
 import javax.annotation.Nullable;